slitaz-forge rev 714

Virtual machines have moved
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Feb 01 10:43:39 2021 +0000 (17 months ago)
parents f911834f9e63
children cfad9fa3f53c
files mirror/info/graphs.php mirror/info/index.php mirror/root/dir-generator.php pangolin/web/graphs.php pangolin/web/index.php tank/web/graphs.php tank/web/index.php
line diff
     1.1 --- a/mirror/info/graphs.php	Fri Jan 15 08:07:41 2021 +0000
     1.2 +++ b/mirror/info/graphs.php	Mon Feb 01 10:43:39 2021 +0000
     1.3 @@ -24,8 +24,6 @@
     1.4  		<a href="http://scn.slitaz.org/">Community</a>
     1.5  		<a href="http://doc.slitaz.org/">Doc</a>
     1.6  		<a href="http://forum.slitaz.org/">Forum</a>
     1.7 -		<a href="http://pro.slitaz.org/">Pro</a>
     1.8 -		<a href="http://slitaz.spreadshirt.net/">Shop</a>
     1.9  		<a href="http://bugs.slitaz.org/">Bugs</a>
    1.10  		<a href="http://hg.slitaz.org/?sort=lastchange">Hg</a>
    1.11  		<a href="http://cook.slitaz.org/">Cook</a>
    1.12 @@ -38,15 +36,14 @@
    1.13  	<!-- Information/image -->
    1.14  	<div class="block_info">
    1.15  		<header>Codename: <?php echo $host; ?></header>
    1.16 -		<p>
    1.17 -			This is the SliTaz GNU/Linux main mirror. The server runs naturally SliTaz 
    1.18 -			(stable) in an UML virtual machine provided by 
    1.19 -			<a href="http://www.ads-lu.com/">Allied Data Sys. (ADS)</a>.
    1.20  		</p>
    1.21 +			<p>This is the SliTaz GNU/Linux main mirror. The server runs naturally 
    1.22 +			SliTaz (stable) in a virtual machine provided by 
    1.23 +			<a href="https://www.linkedin.com/company/balinor-technologies/">balinor-technologies</a>.</p>
    1.24  		<p>
    1.25  			Mirror CPU is a <?php
    1.26  system("( sed '/cpuinfo=/!d;" .
    1.27 -	"s/.*cpuinfo=\\([^ ]*\).*/: \\1/;s/_/ /g' /proc/cmdline ; grep '^model name' /proc/cpuinfo) | sed -e 's/.*Intel(R) //;" .
    1.28 +	"s/.*cpuinfo=\\([^ ]*\).*/: \\1/;s/_/ /g' /proc/cmdline ; grep '^model name' /etc/cpuinfo) | sed -e 's/.*Intel(R) //;" .
    1.29  	"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //;q' |" .
    1.30  	" awk '{ s=$0; n++ } END { if (n == 2) printf \"dual \";" .
    1.31  	"if (n == 4) printf \"quad \"; print s }' ")
    1.32 @@ -54,8 +51,8 @@
    1.33  system("free | awk '/Mem:/ { x=2*$2-1; while (x >= 1024) { x /= 1024; ".
    1.34  	"n++ }; y=1; while (x > 2) { x /= 2; y *= 2}; ".
    1.35  	"printf \"%d%cB RAM\",y,substr(\"MG\",n,1) }' ")
    1.36 -			?> - Located in France next to 
    1.37 -			Roubaix. This page has real time statistics provided by PHP 
    1.38 +			?> - Located in France.
    1.39 +			This page has real time statistics provided by PHP 
    1.40  			<code>system()</code>.
    1.41  			Mirror is monitored by RRDtool which provides graphical stats.
    1.42  		</p>
     2.1 --- a/mirror/info/index.php	Fri Jan 15 08:07:41 2021 +0000
     2.2 +++ b/mirror/info/index.php	Mon Feb 01 10:43:39 2021 +0000
     2.3 @@ -27,8 +27,6 @@
     2.4  		<a href="http://scn.slitaz.org/">Community</a>
     2.5  		<a href="http://doc.slitaz.org/">Doc</a>
     2.6  		<a href="http://forum.slitaz.org/">Forum</a>
     2.7 -		<a href="http://pro.slitaz.org/">Pro</a>
     2.8 -		<a href="http://slitaz.spreadshirt.net/">Shop</a>
     2.9  		<a href="http://bugs.slitaz.org/">Bugs</a>
    2.10  		<a href="http://hg.slitaz.org/?sort=lastchange">Hg</a>
    2.11  		<a href="http://cook.slitaz.org/">Cook</a>
    2.12 @@ -42,13 +40,13 @@
    2.13  	<!-- Top block begin -->
    2.14  	<div class="block_info">
    2.15  		<header>Codename: <?php echo $host; ?></header>
    2.16 -		<p>This is the SliTaz GNU/Linux main mirror.
    2.17 -			The server runs naturally SliTaz (stable) in an UML virtual
    2.18 -			machine provided by
    2.19 -			<a href="http://www.ads-lu.com/">Allied Data Sys. (ADS)</a>.</p>
    2.20 +		</p>
    2.21 +			<p>This is the SliTaz GNU/Linux main mirror. The server runs naturally 
    2.22 +			SliTaz (stable) in a virtual machine provided by 
    2.23 +			<a href="https://www.linkedin.com/company/balinor-technologies/">balinor-technologies</a>.</p>
    2.24  		<p>Mirror CPU is a <?php
    2.25  system("( sed '/cpuinfo=/!d;" .
    2.26 -	"s/.*cpuinfo=\\([^ ]*\).*/: \\1/;s/_/ /g' /proc/cmdline ; grep '^model name' /proc/cpuinfo) | sed -e 's/.*Intel(R) //;" .
    2.27 +	"s/.*cpuinfo=\\([^ ]*\).*/: \\1/;s/_/ /g' /proc/cmdline ; grep '^model name' /etc/cpuinfo) | sed -e 's/.*Intel(R) //;" .
    2.28  	"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //;q' |" .
    2.29  	" awk '{ s=$0; n++ } END { if (n == 2) printf \"dual \";" .
    2.30  	"if (n == 4) printf \"quad \"; print s }' ")
    2.31 @@ -57,7 +55,7 @@
    2.32  	"n++ }; y=1; while (x > 2) { x /= 2; y *= 2}; ".
    2.33  	"printf \"%d%cB RAM\",y,substr(\"MG\",n,1) }' ")
    2.34  		?> -
    2.35 -		Located in France next to Roubaix.
    2.36 +		Located in France.
    2.37  		This page has real time statistics provided by PHP <code>system()</code>.
    2.38  		Mirror is also monitored by RRDtool which provides <a href="graphs.php">graphical stats</a>.</p>
    2.39  	<!-- Top block end -->
     3.1 --- a/mirror/root/dir-generator.php	Fri Jan 15 08:07:41 2021 +0000
     3.2 +++ b/mirror/root/dir-generator.php	Mon Feb 01 10:43:39 2021 +0000
     3.3 @@ -165,6 +165,7 @@
     3.4  //$slitaz_style = (dirname($_SERVER["PHP_SELF"]) == '/');
     3.5  //$slitaz_style = ($_SERVER["SERVER_NAME"] == "mirror1.slitaz.org");
     3.6  $slitaz_style = preg_match("/mirror1\.slitaz\./", $_SERVER["SERVER_NAME"]);
     3.7 +if (!$slitaz_style) $slitaz_style = preg_match("/mirror\.slitaz\./", $_SERVER["SERVER_NAME"]);
     3.8  
     3.9  if ($slitaz_style) {
    3.10  	// SliTaz Style
    3.11 @@ -208,8 +209,6 @@
    3.12  		<a href="http://scn.slitaz.org/">Community</a>
    3.13  		<a href="http://doc.slitaz.org/">Doc</a>
    3.14  		<a href="http://forum.slitaz.org/">Forum</a>
    3.15 -		<a href="http://pro.slitaz.org/">Pro</a>
    3.16 -		<a href="https://slitaz.spreadshirt.net/">Shop</a>
    3.17  		<a href="http://bugs.slitaz.org">Bugs</a>
    3.18  		<a href="http://hg.slitaz.org/?sort=lastchange">Hg</a>
    3.19  		<a href="http://cook.slitaz.org/">Cook</a>
    3.20 @@ -225,10 +224,15 @@
    3.21  	if (preg_match("/mirror1\.slitaz\./", $_SERVER["SERVER_NAME"]))
    3.22  		{ ?>
    3.23  		<p>This is the SliTaz GNU/Linux main mirror. The server runs naturally 
    3.24 -		SliTaz (stable) in an uml virtual machine provided by 
    3.25 -		<a href="http://www.ads-lu.com/">ADS</a> and is located in France.</p>
    3.26 +		SliTaz (stable) in a virtual machine provided by 
    3.27 +		<a href="https://www.linkedin.com/company/balinor-technologies/">balinor-technologies</a>
    3.28 +		and is located in France.</p>
    3.29  		<p><a href="/info/">Mirror info...</a></p>
    3.30  <?php
    3.31 +	} else { ?>
    3.32 +		<p>This is a SliTaz GNU/Linux mirror. The server is synchronized regularly
    3.33 +		with the <a href="https://mirror1.slitaz.org/">Slitaz main mirror</a>
    3.34 +<?php
    3.35  	}
    3.36  
    3.37  	?>
    3.38 @@ -498,7 +502,7 @@
    3.39  
    3.40  // Print folder information
    3.41  foreach($folderlist as $folder)
    3.42 -	print "<tr><td class='dir'><a href='" . addslashes($folder['name']). "'>" .
    3.43 +	print "<tr><td class='dir'><a href='" . addslashes($folder['name']). "/'>" .
    3.44  		htmlentities($folder['name']) . "</a>/</td>" .
    3.45  		"<td>" . $folder['modtimeasc'] . "</td>" .
    3.46  		"<td>- &nbsp;</td></tr>\n";
    3.47 @@ -584,7 +588,7 @@
    3.48  		<a href="http://en.wikipedia.org/wiki/SliTaz">Wikipedia</a> ยท
    3.49  		<a href="http://flattr.com/profile/slitaz">Flattr</a>
    3.50  	</div>
    3.51 -	<img src="static/qr.png" alt="#" onmouseover="this.title = location.href"
    3.52 +	<img src="/static/qr.png" alt="#" onmouseover="this.title = location.href"
    3.53  	onclick="this.src = QRCodePNG(location.href, this)"/>
    3.54  </footer>
    3.55  
     4.1 --- a/pangolin/web/graphs.php	Fri Jan 15 08:07:41 2021 +0000
     4.2 +++ b/pangolin/web/graphs.php	Mon Feb 01 10:43:39 2021 +0000
     4.3 @@ -35,6 +35,7 @@
     4.4  		<ul>
     4.5  			<li><a href="http://www.slitaz.org/en/devel/">Website devel</a></li>
     4.6  			<li><a href="http://scn.slitaz.org/">Community</a></li>
     4.7 +			<li><a href="http://labs.slitaz.org/">Laboratories</a></li>
     4.8  			<li><a href="http://hg.slitaz.org/">Mercurial Repos</a></li>
     4.9  			<li><a href="http://cook.slitaz.org/">Build Bot</a></li>
    4.10  			<li><a href="http://tank.slitaz.org/">Tank Server</a></li>
    4.11 @@ -48,11 +49,12 @@
    4.12  			This is the SliTaz GNU/Linux main server and build host. 
    4.13  			The server runs naturally SliTaz and provides some services
    4.14  			to all contributors such as: secure access, disk space, a 
    4.15 -			public directory or cron jobs.
    4.16 +			public directory or cron jobs. The virtual machine provided by 
    4.17 +			<a href="https://www.linkedin.com/company/balinor-technologies/">balinor-technologies</a>.
    4.18  		</p>
    4.19  		<p>
    4.20  			Pangolin CPU is a <?php system("sed -e '/^model name/!d;s/.*Intel(R) //;" .
    4.21 -			"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //' </proc/cpuinfo |" .
    4.22 +			"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //' </etc/cpuinfo |" .
    4.23  			" awk '{ s=$0; n++ } END { if (n == 2) printf \"dual \";" .
    4.24  			"if (n == 4) printf \"quad \"; print s }' ")?> -
    4.25  			<?php system("free | awk '/Mem:/ { x=2*$2-1; while (x >= 1024) { x /= 1024; ".
     5.1 --- a/pangolin/web/index.php	Fri Jan 15 08:07:41 2021 +0000
     5.2 +++ b/pangolin/web/index.php	Mon Feb 01 10:43:39 2021 +0000
     5.3 @@ -21,7 +21,6 @@
     5.4  		<a href="http://doc.slitaz.org/">Doc</a>
     5.5  		<a href="http://forum.slitaz.org/">Forum</a>
     5.6  		<a href="http://irc.slitaz.org/">IRC</a>
     5.7 -		<a href="http://shop.slitaz.org/">Shop</a>
     5.8  		<a href="http://bugs.slitaz.org">Bugs</a>
     5.9  		<a href="http://hg.slitaz.org/?sort=lastchange">Hg</a>
    5.10  	</div>
    5.11 @@ -54,11 +53,12 @@
    5.12  		<p>
    5.13  			This is the SliTaz GNU/Linux main server and build host. 
    5.14  			The server runs naturally SliTaz and provides some services
    5.15 -			to all contributors.
    5.16 +			to all contributors. The virtual machine provided by 
    5.17 +			<a href="https://www.linkedin.com/company/balinor-technologies/">balinor-technologies</a>.
    5.18  		</p>
    5.19  		<p>
    5.20  			Pangolin CPU is a <?php system("sed -e '/^model name/!d;s/.*Intel(R) //;" .
    5.21 -			"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //' </proc/cpuinfo |" .
    5.22 +			"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //' </etc/cpuinfo |" .
    5.23  			" awk '{ s=$0; n++ } END { if (n == 2) printf \"dual \";" .
    5.24  			"if (n == 4) printf \"quad \"; print s }' ")?> -
    5.25  			<?php system("free | awk '/Mem:/ { x=2*$2-1; while (x >= 1024) { x /= 1024; ".
    5.26 @@ -230,8 +230,17 @@
    5.27  	array(	"flag"  => "de",
    5.28  		"http"  => "http://ftp.uni-stuttgart.de/slitaz/",
    5.29  		"ftp"   => "ftp://ftp.uni-stuttgart.de/slitaz/"),
    5.30 +	array(	"flag"  => "de",
    5.31 +		"ftp"	=> "ftp://fb04272.mathematik.tu-darmstadt.de/pub/linux/distributions/slitaz/",
    5.32 +		"ftp"	=> "ftp://linux.mathematik.tu-darmstadt.de/pub/linux/distributions/misc/slitaz/"),
    5.33 +	array(	"flag"  => "pl",
    5.34 +		"ftp"	=> "ftp://ftp.icm.edu.pl/vol/rzm5/linux-ibiblio/distributions/slitaz/"),
    5.35  	array(	"flag"  => "au",
    5.36  		"http"  => "http://mirror.iprimus.com/slitaz/"),
    5.37 +	array(	"flag"  => "fr",
    5.38 +		"http"	=> "https://dl.aurorafoss.org/slitaz/"),
    5.39 +	array(	"flag"  => "us",
    5.40 +		"http"	=> "http://mirror.math.princeton.edu/pub/slitaz/"),
    5.41  	array(	"flag"  => "us",
    5.42  		"http"  => "http://mirror.clarkson.edu/slitaz/",
    5.43  		"rsync" => "rsync://mirror.clarkson.edu/slitaz/")) as $mirror) {
    5.44 @@ -240,8 +249,10 @@
    5.45  	foreach(array("http", "ftp", "rsync") as $proto) {
    5.46  		if (!isset($mirror[$proto])) continue;
    5.47  		$link = $mirror[$proto];
    5.48 +		$serveur = parse_url($link, PHP_URL_HOST);
    5.49  		if (!test_url($link, $proto)) continue;
    5.50 -		$serveur = parse_url($link, PHP_URL_HOST);
    5.51 +		#if (!test_url($link, $proto)) $link2 = "<del>".$link."</del>";
    5.52 +		#else $link2 = $link;
    5.53  		if ($head) echo <<<EOT
    5.54  	<li><a href="http://en.utrace.de/?query=$serveur">
    5.55  		<img title="map" src="$flag" alt="map" /></a>
     6.1 --- a/tank/web/graphs.php	Fri Jan 15 08:07:41 2021 +0000
     6.2 +++ b/tank/web/graphs.php	Mon Feb 01 10:43:39 2021 +0000
     6.3 @@ -20,7 +20,7 @@
     6.4  	<div id="block_nav">
     6.5  		<h4><img src="images/server.png" alt="[ Server ]" />Project servers</h4>
     6.6  		<ul>
     6.7 -			<li><a href="http://mirror.slitaz.org/">Mirror server</a></li>
     6.8 +			<li><a href="http://mirror1.slitaz.org/">Mirror server</a></li>
     6.9  			<li><a href="http://pangolin.slitaz.org/">Pangolin server</a></li>
    6.10  		</ul>
    6.11  	</div>
    6.12 @@ -31,16 +31,17 @@
    6.13  			This is the SliTaz GNU/Linux main server and build host. 
    6.14  			The server runs naturally SliTaz and provides some services
    6.15  			to all contributors such as: secure access, disk space, a 
    6.16 -			public directory or cron jobs.
    6.17 +			public directory or cron jobs. The virtual machine provided by 
    6.18 +			<a href="https://www.linkedin.com/company/balinor-technologies/">balinor-technologies</a>.
    6.19  		</p>
    6.20  		<p>
    6.21  			Tank CPU is a <?php system("sed -e '/^model name/!d;s/.*Intel(R) //;" .         
    6.22 -			"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //' </proc/cpuinfo |" .
    6.23 +			"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //' </etc/cpuinfo |" .
    6.24  			" awk '{ s=$0; n++ } END { if (n == 2) printf \"dual \";" .
    6.25  			"if (n == 4) printf \"quad \"; print s }' ")?> -
    6.26  			<?php system("free | awk '/Mem:/ { x=2*$2-1; while (x >= 1024) { x /= 1024; ".
    6.27  			"n++ }; y=1; while (x > 2) { x /= 2; y *= 2}; ".
    6.28 -			"printf \"%d%cB RAM\",y,substr(\"MG\",n,1) }' ")?>  - Located in Gravelines,
    6.29 +			"printf \"%d%cB RAM\",y,substr(\"MG\",n,1) }' ")?>  - Located in Paris,
    6.30  			France.
    6.31  		</p>
    6.32  	</div>
     7.1 --- a/tank/web/index.php	Fri Jan 15 08:07:41 2021 +0000
     7.2 +++ b/tank/web/index.php	Mon Feb 01 10:43:39 2021 +0000
     7.3 @@ -21,7 +21,7 @@
     7.4  		<h4><img src="images/development.png" alt="development.png" />Developers Corner</h4>
     7.5  		<div class="right_box">
     7.6  			<ul>
     7.7 -				<li><a href="http://tank.slitaz.org/">Tank Server</a></li>
     7.8 +				<li><a href="http://pangolin.slitaz.org/">Pangolin Server</a></li>
     7.9  				<li><a href="http://mirror1.slitaz.org/">Main Mirror</a></li>
    7.10  				<li><a href="http://tank.slitaz.org/console/">Console</a></li>
    7.11  			</ul>
    7.12 @@ -41,16 +41,17 @@
    7.13  		<p>
    7.14  			This is the SliTaz GNU/Linux main server and build host. 
    7.15  			The server runs naturally SliTaz and provides some services
    7.16 -			to all contributors.
    7.17 +			to all contributors. The virtual machine provided by 
    7.18 +			<a href="https://www.linkedin.com/company/balinor-technologies/">balinor-technologies</a>.
    7.19  		</p>
    7.20  		<p>
    7.21  			Tank CPU is a <?php system("sed -e '/^model name/!d;s/.*Intel(R) //;" .         
    7.22 -			"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //' </proc/cpuinfo |" .
    7.23 +			"s/@//;s/(.*)//;s/CPU //;s/.*AMD //;s/.*: //;s/Processor //' </etc/cpuinfo |" .
    7.24  			" awk '{ s=$0; n++ } END { if (n == 2) printf \"dual \";" .
    7.25  			"if (n == 4) printf \"quad \"; print s }' ")?> -
    7.26  			<?php system("free | awk '/Mem:/ { x=2*$2-1; while (x >= 1024) { x /= 1024; ".
    7.27  			"n++ }; y=1; while (x > 2) { x /= 2; y *= 2}; ".
    7.28 -			"printf \"%d%cB RAM\",y,substr(\"MG\",n,1) }' ")?>  - Located in Gravelines,
    7.29 +			"printf \"%d%cB RAM\",y,substr(\"MG\",n,1) }' ")?>  - Located in Paris,
    7.30  			France. Tank is also monitored by RRDtool which provides 
    7.31  			<a href="graphs.php">graphical stats</a>.
    7.32  		</p>