slitaz-forge rev 578
Main mirror is mirror1.slitaz.org (again)
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Fri Sep 26 17:50:22 2014 +0200 (2014-09-26) |
| parents | 5e1012801aa2 |
| children | d3bd3bebbb03 |
| files | mirror/README mirror/files/etc/rsyncd.motd mirror/floppies/builder/index.php mirror/floppies/mkindex.sh mirror/mirror mixer/rootfs/etc/slitaz/tazdev.conf pangolin/makegraphs pangolin/web/graphs.php pangolin/web/index.php pangolin/web/mirrors tank/files/etc/slitaz/tazdev.conf |
line diff
1.1 --- a/mirror/README Fri Sep 26 17:18:34 2014 +0200 1.2 +++ b/mirror/README Fri Sep 26 17:50:22 2014 +0200 1.3 @@ -10,7 +10,7 @@ 1.4 * root : File for the root directory of http://mirror.slitaz.org/ 1.5 1.6 Host : mirror.slitaz.org 1.7 -IP : http://195.186.4.162/ 1.8 +IP : 91.121.171.224 1.9 1.10 1.11 Administration
2.1 --- a/mirror/files/etc/rsyncd.motd Fri Sep 26 17:18:34 2014 +0200 2.2 +++ b/mirror/files/etc/rsyncd.motd Fri Sep 26 17:50:22 2014 +0200 2.3 @@ -1,6 +1,6 @@ 2.4 =============================================================================== 2.5 2.6 - SliTaz GNU/Linux mirror - http://mirror.slitaz.org/ 2.7 + SliTaz GNU/Linux mirror - http://mirror1.slitaz.org/ 2.8 2.9 =============================================================================== 2.10
3.1 --- a/mirror/floppies/builder/index.php Fri Sep 26 17:18:34 2014 +0200 3.2 +++ b/mirror/floppies/builder/index.php Fri Sep 26 17:50:22 2014 +0200 3.3 @@ -10,7 +10,7 @@ 3.4 <meta name="description" content="slitaz boot floppies builder redirection" /> 3.5 <meta name="robots" content="index, nofollow" /> 3.6 <meta name="author" content="SliTaz Contributors" /> 3.7 - <meta http-equiv="Refresh" content="0;url=http://mirror.slitaz.org/floppies/builder/index.php"> 3.8 + <meta http-equiv="Refresh" content="0;url=http://mirror1.slitaz.org/floppies/builder/index.php"> 3.9 </head> 3.10 </html> 3.11 <?php
4.1 --- a/mirror/floppies/mkindex.sh Fri Sep 26 17:18:34 2014 +0200 4.2 +++ b/mirror/floppies/mkindex.sh Fri Sep 26 17:50:22 2014 +0200 4.3 @@ -187,7 +187,7 @@ 4.4 <a name="fdiso"></a> 4.5 <h2>ISO image floppy set</h2> 4.6 4.7 -<form method="get" action="http://mirror.slitaz.org/floppies/download.php"> 4.8 +<form method="get" action="http://mirror1.slitaz.org/floppies/download.php"> 4.9 <p> 4.10 The floppy image set above includes an embedded installer and can install 4.11 SliTaz on your hard disk.
5.1 --- a/mirror/mirror Fri Sep 26 17:18:34 2014 +0200 5.2 +++ b/mirror/mirror Fri Sep 26 17:50:22 2014 +0200 5.3 @@ -20,9 +20,9 @@ 5.4 5.5 Usage: $(basename $0) [command] 5.6 Commands: 5.7 - up-info Update mirror.slitaz.org/info/ web interface 5.8 + up-info Update mirror1.slitaz.org/info/ web interface 5.9 up-tiny Update tiny.slitaz.org/ web interface 5.10 - up-mirror Update mirror.slitaz.org files 5.11 + up-mirror Update mirror1.slitaz.org files 5.12 up-www Update main website www.slitaz.org 5.13 up-pkgs Update pkgs.slitaz.org web interface 5.14 5.15 @@ -31,7 +31,7 @@ 5.16 5.17 case "$1" in 5.18 up-info) 5.19 - echo "Updating: mirror.slitaz.org/info..." 5.20 + echo "Updating: mirror1.slitaz.org/info..." 5.21 cd $REPOS/slitaz-forge && hg pull -u 5.22 echo "Copying info to: $INFO" 5.23 cp -a mirror/info/* $INFO ;; 5.24 @@ -41,7 +41,7 @@ 5.25 echo "Copying tiny to: $TINY" 5.26 cp -a * $TINY ;; 5.27 up-mirror) 5.28 - echo "Updating: mirror.slitaz.org files..." 5.29 + echo "Updating: mirror1.slitaz.org files..." 5.30 cd $REPOS/slitaz-forge && hg pull -u 5.31 echo "Copying root to: $MIRROR" 5.32 cp -a mirror/root/* $MIRROR ;;
6.1 --- a/mixer/rootfs/etc/slitaz/tazdev.conf Fri Sep 26 17:18:34 2014 +0200 6.2 +++ b/mixer/rootfs/etc/slitaz/tazdev.conf Fri Sep 26 17:50:22 2014 +0200 6.3 @@ -14,6 +14,6 @@ 6.4 CHROOT_PKGS="slitaz-base-files busybox cookutils tazpkg lzma" 6.5 6.6 # Main mirror to push and download (ISO, rootfs. etc). 6.7 -MIRROR="mirror.slitaz.org" 6.8 +MIRROR="mirror1.slitaz.org" 6.9 MIRROR_PKGS="/var/www/slitaz/mirror/packages" 6.10 MIRROR_SOURCES="/var/www/slitaz/mirror/sources"
7.1 --- a/pangolin/makegraphs Fri Sep 26 17:18:34 2014 +0200 7.2 +++ b/pangolin/makegraphs Fri Sep 26 17:50:22 2014 +0200 7.3 @@ -352,9 +352,6 @@ 7.4 updateifgraph $iface month 7.5 updateifgraph $iface year 7.6 7.7 -#rsync --bwlimit=40 -t -e 'ssh -p 222 -i /home/bellard/.ssh/id_rsa' $rrdlog/* \ 7.8 -# bellard@mirror.slitaz.org:/var/spool/rrd/tank/ > /dev/null 2>&1 7.9 - 7.10 [ ! -s $rrdgraph/boot.html -o /var/log/boot.log -nt $rrdgraph/boot.html ] && 7.11 cat > $rrdgraph/boot.html <<EOT 7.12 <html>
8.1 --- a/pangolin/web/graphs.php Fri Sep 26 17:18:34 2014 +0200 8.2 +++ b/pangolin/web/graphs.php Fri Sep 26 17:50:22 2014 +0200 8.3 @@ -39,7 +39,7 @@ 8.4 <li><a href="http://hg.slitaz.org/">Mercurial Repos</a></li> 8.5 <li><a href="http://cook.slitaz.org/">Build Bot</a></li> 8.6 <li><a href="http://tank.slitaz.org/">Tank Server</a></li> 8.7 - <li><a href="http://mirror.slitaz.org/info/">Mirror Server</a></li> 8.8 + <li><a href="http://mirror1.slitaz.org/info/">Mirror Server</a></li> 8.9 </ul> 8.10 </div> 8.11 <!-- Information/image -->
9.1 --- a/pangolin/web/index.php Fri Sep 26 17:18:34 2014 +0200 9.2 +++ b/pangolin/web/index.php Fri Sep 26 17:50:22 2014 +0200 9.3 @@ -129,7 +129,7 @@ 9.4 </p> 9.5 <ul> 9.6 <li><a href="http://mirror.slitaz.org/">mirror.slitaz.org</a> - SliTaz main mirror and replicas. 9.7 - (<a href="http://mirror.slitaz.org/info/">more...</a>)</li> 9.8 + (<a href="http://mirror1.slitaz.org/info/">more...</a>)</li> 9.9 <li><a href="http://pkgs.slitaz.org/">pkgs.slitaz.org</a> - Packages Web interface.</li> 9.10 <li><a href="http://tiny.slitaz.org/">tiny.slitaz.org</a> - Tiny SliTaz builder.</li> 9.11 <!-- ajaxterm archives console-mirror demo dvd floppy ssh usbkey --> 9.12 @@ -141,14 +141,14 @@ 9.13 </ul> 9.14 9.15 <a name="mirrors"></a> 9.16 -<h2><a href="http://mirror.slitaz.org/info/"> <img 9.17 +<h2><a href="http://mirror1.slitaz.org/info/"> <img 9.18 style="vertical-align: middle; padding: 0 4px 4px 0;" 9.19 src="images/network.png" 9.20 title="Secondary mirrors" alt="mirrors" /></a>Mirrors</h2> 9.21 - Most mirrors are updated using the url: <b>rsync://mirror.slitaz.org/slitaz/</b> 9.22 - (<a href="http://mirror.slitaz.org/awstats.pl?config=rsync">stats</a>) 9.23 + Most mirrors are updated using the url: <b>rsync://mirror1.slitaz.org/slitaz/</b> 9.24 + (<a href="http://mirror1.slitaz.org/awstats.pl?config=rsync">stats</a>) 9.25 <pre> 9.26 -rsync -azH --delete rsync://mirror.slitaz.org/slitaz/ /local/slitaz/mirror/ </pre> 9.27 +rsync -azH --delete rsync://mirror1.slitaz.org/slitaz/ /local/slitaz/mirror/ </pre> 9.28 New mirrors should be announced on the 9.29 <a href="http://www.slitaz.org/en/mailing-list.html">mailing list</a>. 9.30 <ul> 9.31 @@ -187,8 +187,8 @@ 9.32 if (! file_exists($mirrors_url_file)) { 9.33 $output_url_file = tempnam('/tmp','mkmirrors'); 9.34 $output_url_handler = fopen($output_url_file, "w"); 9.35 - fwrite($output_url_handler,"http://mirror.slitaz.org/\n"); 9.36 - fwrite($output_url_handler,"rsync://mirror.slitaz.org/\n"); 9.37 + fwrite($output_url_handler,"http://mirror1.slitaz.org/\n"); 9.38 + fwrite($output_url_handler,"rsync://mirror1.slitaz.org/\n"); 9.39 } 9.40 9.41 # Flags icons from http://www.famfamfam.com/lab/icons/flags/famfamfam_flag_icons.zip
10.1 --- a/pangolin/web/mirrors Fri Sep 26 17:18:34 2014 +0200 10.2 +++ b/pangolin/web/mirrors Fri Sep 26 17:50:22 2014 +0200 10.3 @@ -1,5 +1,5 @@ 10.4 http://mirror.slitaz.org/ 10.5 -rsync://mirror.slitaz.org/ 10.6 +rsync://mirror1.slitaz.org/ 10.7 http://mirror.switch.ch/ftp/mirror/slitaz/ 10.8 ftp://mirror.switch.ch/mirror/slitaz/ 10.9 http://www.gtlib.gatech.edu/pub/slitaz/
11.1 --- a/tank/files/etc/slitaz/tazdev.conf Fri Sep 26 17:18:34 2014 +0200 11.2 +++ b/tank/files/etc/slitaz/tazdev.conf Fri Sep 26 17:50:22 2014 +0200 11.3 @@ -14,6 +14,6 @@ 11.4 CHROOT_PKGS="slitaz-base-files busybox cookutils tazpkg lzma" 11.5 11.6 # Main mirror to push and download (ISO, rootfs. etc). 11.7 -MIRROR="mirror.slitaz.org" 11.8 +MIRROR="mirror1.slitaz.org" 11.9 MIRROR_PKGS="/var/www/slitaz/mirror/packages" 11.10 MIRROR_SOURCES="/var/www/slitaz/mirror/sources"