slitaz-modular rev 142

local-mirror: Fixed mirror.slitaz.org/hg/.
author Christopher Rogers <slaxemulator@gmail.com>
date Fri Oct 14 05:47:23 2011 +0000 (2011-10-14)
parents bbf12cc1c55f
children b57ada53a816
files initramfs/etc/lighttpd/vhosts-local-mirror.conf initramfs/usr/bin/local-mirror
line diff
     1.1 --- a/initramfs/etc/lighttpd/vhosts-local-mirror.conf	Fri Sep 16 07:27:21 2011 +0000
     1.2 +++ b/initramfs/etc/lighttpd/vhosts-local-mirror.conf	Fri Oct 14 05:47:23 2011 +0000
     1.3 @@ -38,7 +38,7 @@
     1.4    )
     1.5  
     1.6    alias.url += ( "/hg" => "/home/slitaz/www/hg/" )
     1.7 -###  url.rewrite-once = ( "/hg(.*)" => "/hg/hgwebdir.py$1" )
     1.8 +  url.rewrite-once = ( "/hg(.*)" => "/hg/hgwebdir.py$1" )
     1.9    index-file.names += ( "hgwebdir.py" )
    1.10    cgi.assign += (
    1.11      ".py" => "/usr/bin/python"
     2.1 --- a/initramfs/usr/bin/local-mirror	Fri Sep 16 07:27:21 2011 +0000
     2.2 +++ b/initramfs/usr/bin/local-mirror	Fri Oct 14 05:47:23 2011 +0000
     2.3 @@ -181,6 +181,7 @@
     2.4  			[ -f /usr/share/cook/header.html ] && cp -a /usr/share/cook/header.html $MAIN_WWW_DIR/cook/header.html
     2.5  			if [ "$MKCHROOT" = "yes" ]; then
     2.6  				if [ -d $PKGDIR ]; then
     2.7 +					tazpkg recharge
     2.8  					tazdev gen-chroot $version
     2.9  					[ -d $SLITAZ_DIR/$version/chroot ] && mkdir -p $SLITAZ_DIR/$version/chroot$(dirname $CRON_FILE)
    2.10  					[ -d $SLITAZ_DIR/$version/chroot ] && echo "0 */2 * * * /usr/bin/cooker" > $SLITAZ_DIR/$version/chroot${CRON_FILE}
    2.11 @@ -197,15 +198,15 @@
    2.12  		pkgs)
    2.13  			[ -d $MAIN_WWW_DIR/pkgs ] || mkdir -p $MAIN_WWW_DIR/pkgs
    2.14  			pwd=$(pwd)
    2.15 -			if [ -d $REPOS_DIR/slitaz-dev-tools/tazpkg-web ]; then
    2.16 -				cd $REPOS_DIR/slitaz-dev-tools/tazpkg-web
    2.17 -				make install
    2.18 -				cd $pwd
    2.19 -			fi
    2.20 -			#[ -d /var/lib/tazpkg-web/style ] && cp -a /var/lib/tazpkg-web/style/* $MAIN_WWW_DIR/pkgs
    2.21 -			#[ -f /var/lib/tazpkg-web/search.cgi ] && cp -a /var/lib/tazpkg-web/search.cgi $MAIN_WWW_DIR/pkgs
    2.22 -			[ -d $REPOS_DIR/slitaz-dev-tools/tazpkg-web/style ] && cp -a $REPOS_DIR/slitaz-dev-tools/tazpkg-web/style/* $MAIN_WWW_DIR/pkgs
    2.23 -			[ -f $REPOS_DIR/slitaz-dev-tools/tazpkg-web/search.cgi ] && cp -a $REPOS_DIR/slitaz-dev-tools/tazpkg-web/search.cgi $MAIN_WWW_DIR/pkgs
    2.24 +			#if [ -d $REPOS_DIR/slitaz-dev-tools/tazpkg-web ]; then
    2.25 +			#	cd $REPOS_DIR/slitaz-dev-tools/tazpkg-web
    2.26 +			#	make install
    2.27 +			#	cd $pwd
    2.28 +			#fi
    2.29 +			[ -d /var/lib/tazpkg-web/style ] && cp -a /var/lib/tazpkg-web/style/* $MAIN_WWW_DIR/pkgs
    2.30 +			[ -f /var/lib/tazpkg-web/search.cgi ] && cp -a /var/lib/tazpkg-web/search.cgi $MAIN_WWW_DIR/pkgs
    2.31 +			#[ -d $REPOS_DIR/slitaz-dev-tools/tazpkg-web/style ] && cp -a $REPOS_DIR/slitaz-dev-tools/tazpkg-web/style/* $MAIN_WWW_DIR/pkgs
    2.32 +			#[ -f $REPOS_DIR/slitaz-dev-tools/tazpkg-web/search.cgi ] && cp -a $REPOS_DIR/slitaz-dev-tools/tazpkg-web/search.cgi $MAIN_WWW_DIR/pkgs
    2.33  			[ -d $REPOS_DIR/flavors ] && ln -sf $REPOS_DIR/flavors $COOKING/flavors
    2.34  			#[ -d $REPOS_DIR/flavors-stable ] && ln -sf $REPOS_DIR/flavors-stable $STABLE/flavors
    2.35  			#[ -d $COOKING/wok ] || ln -sf $REPOS_DIR/wok $COOKING/clean-wok
    2.36 @@ -262,7 +263,10 @@
    2.37  		hg)
    2.38  			[ -d $MAIN_WWW_DIR/hg ] || mkdir -p $MAIN_WWW_DIR/hg
    2.39  			[ -f /usr/share/examples/mercurial/hgwebdir.cgi ] && cp -a /usr/share/examples/mercurial/hgwebdir.cgi $MAIN_WWW_DIR/hg
    2.40 -			[ -f $REPOS_DIR/slitaz-forge/tank/files/etc/mercurial/hgweb.config ] && cp -a $REPOS_DIR/slitaz-forge/tank/files/etc/mercurial/hgweb.config /etc/mercurial/hgweb.config
    2.41 +			[ -f /usr/share/examples/mercurial/hgwebdir.cgi ] && cp -a /usr/share/examples/mercurial/hgwebdir.cgi $MAIN_WWW_DIR/hg/hgwebdir.py
    2.42 +			[ -f $REPOS_DIR/slitaz-forge/tank/files/etc/mercurial/hgweb.config ] && cp -a $REPOS_DIR/slitaz-forge/tank/files/etc/mercurial/hgweb.config /etc/mercurial
    2.43 +			[ -f $REPOS_DIR/slitaz-forge/tank/files/etc/mercurial/hgweb.config-mirror ] && cp -a $REPOS_DIR/slitaz-forge/tank/files/etc/mercurial/hgweb.config-mirror /etc/mercurial
    2.44 +			sed -i 's|/etc/mercurial/hgweb.config|/etc/mercurial/hgweb.config-mirror|g' $MAIN_WWW_DIR/hg/hgwebdir.py
    2.45  			#[ -f /etc/mercurial/hgweb.conf ] && sed -i 's|style = slitaz|style = gitweb|g' /etc/mercurial/hgweb.config
    2.46  		;;
    2.47  		lfs)