# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1612176219 0
# Node ID 9e7953989d7418e22c3f1bc63567153dabb5c32b
# Parent  f911834f9e63c4bc023e532f19f0125ceede8466
Virtual machines have moved

diff -r f911834f9e63 -r 9e7953989d74 mirror/info/graphs.php
--- a/mirror/info/graphs.php	Fri Jan 15 08:07:41 2021 +0000
+++ b/mirror/info/graphs.php	Mon Feb 01 10:43:39 2021 +0000
@@ -24,8 +24,6 @@
 		<a href="http://scn.slitaz.org/">Community</a>
 		<a href="http://doc.slitaz.org/">Doc</a>
 		<a href="http://forum.slitaz.org/">Forum</a>
-		<a href="http://pro.slitaz.org/">Pro</a>
-		<a href="http://slitaz.spreadshirt.net/">Shop</a>
 		<a href="http://bugs.slitaz.org/">Bugs</a>
 		<a href="http://hg.slitaz.org/?sort=lastchange">Hg</a>
 		<a href="http://cook.slitaz.org/">Cook</a>
@@ -38,15 +36,14 @@
 	<!-- Information/image -->
 	<div class="block_info">
 		<header>Codename: <?php echo $host; ?></header>
-		<p>
-			This is the SliTaz GNU/Linux main mirror. The server runs naturally SliTaz 
-			(stable) in an UML virtual machine provided by 
-			<a href="http://www.ads-lu.com/">Allied Data Sys. (ADS)</a>.
 		</p>
+			<p>This is the SliTaz GNU/Linux main mirror. The server runs naturally 
+			SliTaz (stable) in a virtual machine provided by 
+			<a href="https://www.linkedin.com/company/balinor-technologies/">balinor-technologies</a>.</p>
 		<p>
 			Mirror CPU is a <?php
 system("( sed '/cpuinfo=/!d;" .
-	"s/.*cpuinfo=\\([^ ]*\).*/: \\1/;s/_/ /g' /proc/cmdline ; grep '^model name' /proc/cpuinfo) | sed -e 's/.*Intel(R) //;" .
+	"s/.*cpuinfo=\\([^ ]*\).*/: \\1/;s/_/ /g' /proc/cmdline ; grep '^model name' /etc/cpuinfo) | sed -e 's/.*Intel(R) //;" .
 	"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //;q' |" .
 	" awk '{ s=$0; n++ } END { if (n == 2) printf \"dual \";" .
 	"if (n == 4) printf \"quad \"; print s }' ")
@@ -54,8 +51,8 @@
 system("free | awk '/Mem:/ { x=2*$2-1; while (x >= 1024) { x /= 1024; ".
 	"n++ }; y=1; while (x > 2) { x /= 2; y *= 2}; ".
 	"printf \"%d%cB RAM\",y,substr(\"MG\",n,1) }' ")
-			?> - Located in France next to 
-			Roubaix. This page has real time statistics provided by PHP 
+			?> - Located in France.
+			This page has real time statistics provided by PHP 
 			<code>system()</code>.
 			Mirror is monitored by RRDtool which provides graphical stats.
 		</p>
diff -r f911834f9e63 -r 9e7953989d74 mirror/info/index.php
--- a/mirror/info/index.php	Fri Jan 15 08:07:41 2021 +0000
+++ b/mirror/info/index.php	Mon Feb 01 10:43:39 2021 +0000
@@ -27,8 +27,6 @@
 		<a href="http://scn.slitaz.org/">Community</a>
 		<a href="http://doc.slitaz.org/">Doc</a>
 		<a href="http://forum.slitaz.org/">Forum</a>
-		<a href="http://pro.slitaz.org/">Pro</a>
-		<a href="http://slitaz.spreadshirt.net/">Shop</a>
 		<a href="http://bugs.slitaz.org/">Bugs</a>
 		<a href="http://hg.slitaz.org/?sort=lastchange">Hg</a>
 		<a href="http://cook.slitaz.org/">Cook</a>
@@ -42,13 +40,13 @@
 	<!-- Top block begin -->
 	<div class="block_info">
 		<header>Codename: <?php echo $host; ?></header>
-		<p>This is the SliTaz GNU/Linux main mirror.
-			The server runs naturally SliTaz (stable) in an UML virtual
-			machine provided by
-			<a href="http://www.ads-lu.com/">Allied Data Sys. (ADS)</a>.</p>
+		</p>
+			<p>This is the SliTaz GNU/Linux main mirror. The server runs naturally 
+			SliTaz (stable) in a virtual machine provided by 
+			<a href="https://www.linkedin.com/company/balinor-technologies/">balinor-technologies</a>.</p>
 		<p>Mirror CPU is a <?php
 system("( sed '/cpuinfo=/!d;" .
-	"s/.*cpuinfo=\\([^ ]*\).*/: \\1/;s/_/ /g' /proc/cmdline ; grep '^model name' /proc/cpuinfo) | sed -e 's/.*Intel(R) //;" .
+	"s/.*cpuinfo=\\([^ ]*\).*/: \\1/;s/_/ /g' /proc/cmdline ; grep '^model name' /etc/cpuinfo) | sed -e 's/.*Intel(R) //;" .
 	"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //;q' |" .
 	" awk '{ s=$0; n++ } END { if (n == 2) printf \"dual \";" .
 	"if (n == 4) printf \"quad \"; print s }' ")
@@ -57,7 +55,7 @@
 	"n++ }; y=1; while (x > 2) { x /= 2; y *= 2}; ".
 	"printf \"%d%cB RAM\",y,substr(\"MG\",n,1) }' ")
 		?> -
-		Located in France next to Roubaix.
+		Located in France.
 		This page has real time statistics provided by PHP <code>system()</code>.
 		Mirror is also monitored by RRDtool which provides <a href="graphs.php">graphical stats</a>.</p>
 	<!-- Top block end -->
diff -r f911834f9e63 -r 9e7953989d74 mirror/root/dir-generator.php
--- a/mirror/root/dir-generator.php	Fri Jan 15 08:07:41 2021 +0000
+++ b/mirror/root/dir-generator.php	Mon Feb 01 10:43:39 2021 +0000
@@ -165,6 +165,7 @@
 //$slitaz_style = (dirname($_SERVER["PHP_SELF"]) == '/');
 //$slitaz_style = ($_SERVER["SERVER_NAME"] == "mirror1.slitaz.org");
 $slitaz_style = preg_match("/mirror1\.slitaz\./", $_SERVER["SERVER_NAME"]);
+if (!$slitaz_style) $slitaz_style = preg_match("/mirror\.slitaz\./", $_SERVER["SERVER_NAME"]);
 
 if ($slitaz_style) {
 	// SliTaz Style
@@ -208,8 +209,6 @@
 		<a href="http://scn.slitaz.org/">Community</a>
 		<a href="http://doc.slitaz.org/">Doc</a>
 		<a href="http://forum.slitaz.org/">Forum</a>
-		<a href="http://pro.slitaz.org/">Pro</a>
-		<a href="https://slitaz.spreadshirt.net/">Shop</a>
 		<a href="http://bugs.slitaz.org">Bugs</a>
 		<a href="http://hg.slitaz.org/?sort=lastchange">Hg</a>
 		<a href="http://cook.slitaz.org/">Cook</a>
@@ -225,10 +224,15 @@
 	if (preg_match("/mirror1\.slitaz\./", $_SERVER["SERVER_NAME"]))
 		{ ?>
 		<p>This is the SliTaz GNU/Linux main mirror. The server runs naturally 
-		SliTaz (stable) in an uml virtual machine provided by 
-		<a href="http://www.ads-lu.com/">ADS</a> and is located in France.</p>
+		SliTaz (stable) in a virtual machine provided by 
+		<a href="https://www.linkedin.com/company/balinor-technologies/">balinor-technologies</a>
+		and is located in France.</p>
 		<p><a href="/info/">Mirror info...</a></p>
 <?php
+	} else { ?>
+		<p>This is a SliTaz GNU/Linux mirror. The server is synchronized regularly
+		with the <a href="https://mirror1.slitaz.org/">Slitaz main mirror</a>
+<?php
 	}
 
 	?>
@@ -498,7 +502,7 @@
 
 // Print folder information
 foreach($folderlist as $folder)
-	print "<tr><td class='dir'><a href='" . addslashes($folder['name']). "'>" .
+	print "<tr><td class='dir'><a href='" . addslashes($folder['name']). "/'>" .
 		htmlentities($folder['name']) . "</a>/</td>" .
 		"<td>" . $folder['modtimeasc'] . "</td>" .
 		"<td>- &nbsp;</td></tr>\n";
@@ -584,7 +588,7 @@
 		<a href="http://en.wikipedia.org/wiki/SliTaz">Wikipedia</a> ·
 		<a href="http://flattr.com/profile/slitaz">Flattr</a>
 	</div>
-	<img src="static/qr.png" alt="#" onmouseover="this.title = location.href"
+	<img src="/static/qr.png" alt="#" onmouseover="this.title = location.href"
 	onclick="this.src = QRCodePNG(location.href, this)"/>
 </footer>
 
diff -r f911834f9e63 -r 9e7953989d74 pangolin/web/graphs.php
--- a/pangolin/web/graphs.php	Fri Jan 15 08:07:41 2021 +0000
+++ b/pangolin/web/graphs.php	Mon Feb 01 10:43:39 2021 +0000
@@ -35,6 +35,7 @@
 		<ul>
 			<li><a href="http://www.slitaz.org/en/devel/">Website devel</a></li>
 			<li><a href="http://scn.slitaz.org/">Community</a></li>
+			<li><a href="http://labs.slitaz.org/">Laboratories</a></li>
 			<li><a href="http://hg.slitaz.org/">Mercurial Repos</a></li>
 			<li><a href="http://cook.slitaz.org/">Build Bot</a></li>
 			<li><a href="http://tank.slitaz.org/">Tank Server</a></li>
@@ -48,11 +49,12 @@
 			This is the SliTaz GNU/Linux main server and build host. 
 			The server runs naturally SliTaz and provides some services
 			to all contributors such as: secure access, disk space, a 
-			public directory or cron jobs.
+			public directory or cron jobs. The virtual machine provided by 
+			<a href="https://www.linkedin.com/company/balinor-technologies/">balinor-technologies</a>.
 		</p>
 		<p>
 			Pangolin CPU is a <?php system("sed -e '/^model name/!d;s/.*Intel(R) //;" .
-			"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //' </proc/cpuinfo |" .
+			"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //' </etc/cpuinfo |" .
 			" awk '{ s=$0; n++ } END { if (n == 2) printf \"dual \";" .
 			"if (n == 4) printf \"quad \"; print s }' ")?> -
 			<?php system("free | awk '/Mem:/ { x=2*$2-1; while (x >= 1024) { x /= 1024; ".
diff -r f911834f9e63 -r 9e7953989d74 pangolin/web/index.php
--- a/pangolin/web/index.php	Fri Jan 15 08:07:41 2021 +0000
+++ b/pangolin/web/index.php	Mon Feb 01 10:43:39 2021 +0000
@@ -21,7 +21,6 @@
 		<a href="http://doc.slitaz.org/">Doc</a>
 		<a href="http://forum.slitaz.org/">Forum</a>
 		<a href="http://irc.slitaz.org/">IRC</a>
-		<a href="http://shop.slitaz.org/">Shop</a>
 		<a href="http://bugs.slitaz.org">Bugs</a>
 		<a href="http://hg.slitaz.org/?sort=lastchange">Hg</a>
 	</div>
@@ -54,11 +53,12 @@
 		<p>
 			This is the SliTaz GNU/Linux main server and build host. 
 			The server runs naturally SliTaz and provides some services
-			to all contributors.
+			to all contributors. The virtual machine provided by 
+			<a href="https://www.linkedin.com/company/balinor-technologies/">balinor-technologies</a>.
 		</p>
 		<p>
 			Pangolin CPU is a <?php system("sed -e '/^model name/!d;s/.*Intel(R) //;" .
-			"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //' </proc/cpuinfo |" .
+			"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //' </etc/cpuinfo |" .
 			" awk '{ s=$0; n++ } END { if (n == 2) printf \"dual \";" .
 			"if (n == 4) printf \"quad \"; print s }' ")?> -
 			<?php system("free | awk '/Mem:/ { x=2*$2-1; while (x >= 1024) { x /= 1024; ".
@@ -230,8 +230,17 @@
 	array(	"flag"  => "de",
 		"http"  => "http://ftp.uni-stuttgart.de/slitaz/",
 		"ftp"   => "ftp://ftp.uni-stuttgart.de/slitaz/"),
+	array(	"flag"  => "de",
+		"ftp"	=> "ftp://fb04272.mathematik.tu-darmstadt.de/pub/linux/distributions/slitaz/",
+		"ftp"	=> "ftp://linux.mathematik.tu-darmstadt.de/pub/linux/distributions/misc/slitaz/"),
+	array(	"flag"  => "pl",
+		"ftp"	=> "ftp://ftp.icm.edu.pl/vol/rzm5/linux-ibiblio/distributions/slitaz/"),
 	array(	"flag"  => "au",
 		"http"  => "http://mirror.iprimus.com/slitaz/"),
+	array(	"flag"  => "fr",
+		"http"	=> "https://dl.aurorafoss.org/slitaz/"),
+	array(	"flag"  => "us",
+		"http"	=> "http://mirror.math.princeton.edu/pub/slitaz/"),
 	array(	"flag"  => "us",
 		"http"  => "http://mirror.clarkson.edu/slitaz/",
 		"rsync" => "rsync://mirror.clarkson.edu/slitaz/")) as $mirror) {
@@ -240,8 +249,10 @@
 	foreach(array("http", "ftp", "rsync") as $proto) {
 		if (!isset($mirror[$proto])) continue;
 		$link = $mirror[$proto];
+		$serveur = parse_url($link, PHP_URL_HOST);
 		if (!test_url($link, $proto)) continue;
-		$serveur = parse_url($link, PHP_URL_HOST);
+		#if (!test_url($link, $proto)) $link2 = "<del>".$link."</del>";
+		#else $link2 = $link;
 		if ($head) echo <<<EOT
 	<li><a href="http://en.utrace.de/?query=$serveur">
 		<img title="map" src="$flag" alt="map" /></a>
diff -r f911834f9e63 -r 9e7953989d74 tank/web/graphs.php
--- a/tank/web/graphs.php	Fri Jan 15 08:07:41 2021 +0000
+++ b/tank/web/graphs.php	Mon Feb 01 10:43:39 2021 +0000
@@ -20,7 +20,7 @@
 	<div id="block_nav">
 		<h4><img src="images/server.png" alt="[ Server ]" />Project servers</h4>
 		<ul>
-			<li><a href="http://mirror.slitaz.org/">Mirror server</a></li>
+			<li><a href="http://mirror1.slitaz.org/">Mirror server</a></li>
 			<li><a href="http://pangolin.slitaz.org/">Pangolin server</a></li>
 		</ul>
 	</div>
@@ -31,16 +31,17 @@
 			This is the SliTaz GNU/Linux main server and build host. 
 			The server runs naturally SliTaz and provides some services
 			to all contributors such as: secure access, disk space, a 
-			public directory or cron jobs.
+			public directory or cron jobs. The virtual machine provided by 
+			<a href="https://www.linkedin.com/company/balinor-technologies/">balinor-technologies</a>.
 		</p>
 		<p>
 			Tank CPU is a <?php system("sed -e '/^model name/!d;s/.*Intel(R) //;" .         
-			"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //' </proc/cpuinfo |" .
+			"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //' </etc/cpuinfo |" .
 			" awk '{ s=$0; n++ } END { if (n == 2) printf \"dual \";" .
 			"if (n == 4) printf \"quad \"; print s }' ")?> -
 			<?php system("free | awk '/Mem:/ { x=2*$2-1; while (x >= 1024) { x /= 1024; ".
 			"n++ }; y=1; while (x > 2) { x /= 2; y *= 2}; ".
-			"printf \"%d%cB RAM\",y,substr(\"MG\",n,1) }' ")?>  - Located in Gravelines,
+			"printf \"%d%cB RAM\",y,substr(\"MG\",n,1) }' ")?>  - Located in Paris,
 			France.
 		</p>
 	</div>
diff -r f911834f9e63 -r 9e7953989d74 tank/web/index.php
--- a/tank/web/index.php	Fri Jan 15 08:07:41 2021 +0000
+++ b/tank/web/index.php	Mon Feb 01 10:43:39 2021 +0000
@@ -21,7 +21,7 @@
 		<h4><img src="images/development.png" alt="development.png" />Developers Corner</h4>
 		<div class="right_box">
 			<ul>
-				<li><a href="http://tank.slitaz.org/">Tank Server</a></li>
+				<li><a href="http://pangolin.slitaz.org/">Pangolin Server</a></li>
 				<li><a href="http://mirror1.slitaz.org/">Main Mirror</a></li>
 				<li><a href="http://tank.slitaz.org/console/">Console</a></li>
 			</ul>
@@ -41,16 +41,17 @@
 		<p>
 			This is the SliTaz GNU/Linux main server and build host. 
 			The server runs naturally SliTaz and provides some services
-			to all contributors.
+			to all contributors. The virtual machine provided by 
+			<a href="https://www.linkedin.com/company/balinor-technologies/">balinor-technologies</a>.
 		</p>
 		<p>
 			Tank CPU is a <?php system("sed -e '/^model name/!d;s/.*Intel(R) //;" .         
-			"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //' </proc/cpuinfo |" .
+			"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //' </etc/cpuinfo |" .
 			" awk '{ s=$0; n++ } END { if (n == 2) printf \"dual \";" .
 			"if (n == 4) printf \"quad \"; print s }' ")?> -
 			<?php system("free | awk '/Mem:/ { x=2*$2-1; while (x >= 1024) { x /= 1024; ".
 			"n++ }; y=1; while (x > 2) { x /= 2; y *= 2}; ".
-			"printf \"%d%cB RAM\",y,substr(\"MG\",n,1) }' ")?>  - Located in Gravelines,
+			"printf \"%d%cB RAM\",y,substr(\"MG\",n,1) }' ")?>  - Located in Paris,
 			France. Tank is also monitored by RRDtool which provides 
 			<a href="graphs.php">graphical stats</a>.
 		</p>