SliTaz Repositories

     1.1 --- a/initramfs/usr/bin/local-mirror	Fri Aug 26 21:14:33 2011 +0000
     1.2 +++ b/initramfs/usr/bin/local-mirror	Sat Aug 27 13:00:30 2011 +0000
     1.3 @@ -212,14 +212,14 @@
     1.4  			[ -d $REPOS_DIR/slitaz-dev-tools/mirror-tools/slitaz ] && cp -a $REPOS_DIR/slitaz-dev-tools/mirror-tools/slitaz $MAIN_WWW_DIR
     1.5  			[ -d $MAIN_WWW_DIR/slitaz/mirror/packages ] || mkdir -p $MAIN_WWW_DIR/slitaz/mirror/packages
     1.6  			[ -d $PKGDIR ] && ln -sf $PKGDIR $MAIN_WWW_DIR/slitaz/mirror/packages/$version
     1.7 -			if [ -d $SRCDIR ]; then
     1.8 -				for i in $(ls $SRCDIR); do
     1.9 -					[ -d $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1} ] || mkdir -p $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1}
    1.10 -					[ -f $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1}/$i ] || ln -s $SRCDIR/$i $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1}/$i
    1.11 -				done
    1.12 -				unset i
    1.13 +			[ -d /var/www/slitaz ] || ln -sf $MAIN_WWW_DIR/slitaz /var/www/slitaz
    1.14 +			[ -d /var/www/mirror-info ] || ln -sf $MAIN_WWW_DIR/mirror-info /var/www/mirror-info
    1.15 +			if [ -f /var/www/mirror-info/bin/makegraphs ]; then
    1.16 +				if [ ! $(grep -l "/var/www/mirror-info/bin/makegraphs" $CRON_FILE) ]; then
    1.17 +					echo "# Update mirror system load graphics" >> $CRON_FILE
    1.18 +					echo "*/5 * * * * /var/www/mirror-info/bin/makegraphs" >> $CRON_FILE
    1.19 +				fi
    1.20  			fi
    1.21 -			[ -d /var/www/slitaz ] || ln -sf $MAIN_WWW_DIR/slitaz /var/www/slitaz
    1.22  		;;
    1.23  		boot)
    1.24  			[ -d $BOOT_WWW_DIR ] && cp -a $BOOT_WWW_DIR $MAIN_WWW_DIR/$b
    1.25 @@ -243,7 +243,7 @@
    1.26  			fi
    1.27  			if [ -f $MAIN_WWW_DIR/tank/bin/makegraphs ]; then
    1.28  				if [ ! $(grep -l "$MAIN_WWW_DIR/tank/bin/makegraphs" $CRON_FILE) ]; then
    1.29 -					echo "# Update system load graphics" >> $CRON_FILE
    1.30 +					echo "# Update tank system load graphics" >> $CRON_FILE
    1.31  					echo "*/5 * * * * $MAIN_WWW_DIR/tank/bin/makegraphs" >> $CRON_FILE
    1.32  				fi
    1.33  			fi
    1.34 @@ -348,6 +348,17 @@
    1.35  	done
    1.36  }
    1.37  
    1.38 +up_src_links() {
    1.39 +	local i
    1.40 +	if [ -d $SRCDIR ]; then
    1.41 +		[ -d $MAIN_WWW_DIR/slitaz/mirror/sources/packages ] && rm -rf $MAIN_WWW_DIR/slitaz/mirror/sources/packages
    1.42 +		for i in $(ls $SRCDIR); do
    1.43 +			[ -d $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1} ] || mkdir -p $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1}
    1.44 +			[ -f $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1}/$i ] || ln -sf $SRCDIR/$i $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1}/$i
    1.45 +		done
    1.46 +	fi
    1.47 +}
    1.48 +
    1.49  case "$COMMAND" in 
    1.50  	start|on|tank-only|mirror-only)
    1.51  		[ -d $MAIN_WWW_DIR/mirror-info ] && WWW="${WWW/mirror /}"
    1.52 @@ -383,6 +394,7 @@
    1.53  			[ -f $VHOST_FILE ] && ln -sf $VHOST_FILE /etc/lighttpd/vhosts.conf
    1.54  		fi
    1.55  		chown -R www.www $SLITAZ_DIR/www
    1.56 +		up_src_links
    1.57  		[ -x /etc/init.d/lighttpd ] && /etc/init.d/lighttpd start
    1.58  		[ -x /etc/init.d/crond ] && /etc/init.d/crond start
    1.59  		;;
    1.60 @@ -398,14 +410,7 @@
    1.61  		cd $pwd
    1.62  		;;
    1.63  	up-src-links)
    1.64 -		if [ -d $SRCDIR ]; then
    1.65 -			[ -d $MAIN_WWW_DIR/slitaz/mirror/sources/packages ] && rm -rf $MAIN_WWW_DIR/slitaz/mirror/sources/packages
    1.66 -			for i in $(ls $SRCDIR); do
    1.67 -				[ -d $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1} ] || mkdir -p $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1}
    1.68 -				[ -f $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1}/$i ] || ln -sf $SRCDIR/$i $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1}/$i
    1.69 -			done
    1.70 -			unset i
    1.71 -		fi
    1.72 +		up_src_links
    1.73  		;;
    1.74  	backup-mirror|-bm)
    1.75  		case "$2" in
    1.76 @@ -441,7 +446,7 @@
    1.77  				echo "$0 backup-mirror repos-dry-{push|pull}"
    1.78  				echo "$0 backup-mirror repos-{push|pull}" ;;
    1.79  		esac ;;
    1.80 -	off)
    1.81 +	off|stop)
    1.82  		[ -x /etc/init.d/lighttpd ] && /etc/init.d/lighttpd stop
    1.83  		[ -x /etc/init.d/crond ] && /etc/init.d/crond stop
    1.84  		echo "127.0.0.1 localhost $(cat /etc/hostname) tazpanel" > /etc/hosts