# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1290072109 -3600
# Node ID bea570b9faaabd5a5346295621d016c62dcc3762
# Parent  a6137e640e0141e1fc1ed4a42c36070056f6184c
mirror-tools: add /etc/lighttpd/vhosts.conf

diff -r a6137e640e01 -r bea570b9faaa mirror-tools/stuff/etc/lighttpd/vhosts.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mirror-tools/stuff/etc/lighttpd/vhosts.conf	Thu Nov 18 10:21:49 2010 +0100
@@ -0,0 +1,171 @@
+# /etc/lighttpd/vhosts.conf : Virtual hosts configuration file.
+#
+
+# Example.org
+#
+#$HTTP["host"] =~ "(^|\.)example\.org$" {
+  #server.document-root = "/var/www/vhost/exemple.com/html"
+  #server.errorlog = "/var/log/lighttpd/example.org-error.log"
+  #accesslog.filename = "/var/log/lighttpd/example.org-access.log"
+#}
+
+# mirror.slitaz.org (Server canonical hostname)
+#
+$HTTP["host"] =~ "^mirror\.slitaz\.org$" {
+  server.document-root = "/var/www/slitaz/mirror"
+  server.errorlog = "/var/log/lighttpd/mirror.slitaz.org-error.log"
+  accesslog.filename = "/var/log/lighttpd/mirror.slitaz.org-access.log"
+  
+  include "awstats.conf"
+  
+  alias.url += ( "/info" => "/var/www/mirror-info/" )
+  
+  alias.url += ( "/pizza" => "/var/www/pizza/" )
+  
+  alias.url += ( "/doc" => "/var/www/doc/" )
+  var.dokudir = "/doc"
+  # Rewrites for dokuwiki
+  url.rewrite = (
+    "^" + var.dokudir + "/lib/.*$"              => "$0",
+     "^" + var.dokudir + "/_media/(.*)?\?(.*)$"  => var.dokudir + "/lib/exe/fetch.php?media=$1&$2",
+     "^" + var.dokudir + "/_media/(.*)$"         => var.dokudir + "/lib/exe/fetch.php?media=$1",
+     "^" + var.dokudir + "/_detail/(.*)?\?(.*)$" => var.dokudir + "/lib/exe/detail.php?media=$1&$2",
+     "^" + var.dokudir + "/_detail/(.*)?$"       => var.dokudir + "/lib/exe/detail.php?media=$1",
+     "^" + var.dokudir + "/_export/([^/]+)/(.*)\?(.*)$" => var.dokudir + "/doku.php?do=export_$1&id=$2&$3",
+     "^" + var.dokudir + "/_export/([^/]+)/(.*)" => var.dokudir + "/doku.php?do=export_$1&id=$2",
+     "^" + var.dokudir + "/doku.php.*"           => "$0",
+     "^" + var.dokudir + "/feed.php.*"           => "$0",
+     "^" + var.dokudir + "/(.*)\?(.*)"           => var.dokudir + "/doku.php?id=$1&$2",
+     "^" + var.dokudir + "/(.*)"                 => var.dokudir + "/doku.php?id=$1"
+  )
+
+  alias.url += ( "/webboot" => "/var/www/boot/" )
+
+  alias.url += ( "/pkgs" => "/var/www/pkgs/" )
+  index-file.names += ( "search.sh" )
+  cgi.assign += (
+    ".sh" => "/bin/sh"
+  )
+
+  alias.url += ( "/hg" => "/var/www/hg/" )
+###  url.rewrite-once = ( "/hg(.*)" => "/hg/hgwebdir.py$1" )
+  index-file.names += ( "hgwebdir.py" )
+  cgi.assign += (
+    ".py" => "/usr/bin/python"
+  )
+
+  alias.url += ( "/www" => "/home/slitaz/website" )
+  
+#  alias.url += ( "/tiny" => "/var/www/pizza/tiny/demos/192.168.0.6/var/www" )
+#  index-file.names += ( "index.sh" )
+  
+  index-file.names += ( "index.html" )
+  index-file.names += ( "index.php" )
+  # Last but not least...
+  index-file.names += ( "/dir-generator.php" )
+}
+
+## info.mirror.slitaz.org
+##
+#$HTTP["host"] =~ "^info\.mirror\.slitaz\.org$" {
+#  server.document-root = "/var/www/mirror-info/"
+#  server.errorlog = "/var/log/lighttpd/info.mirror.slitaz.org-error.log"
+#  accesslog.filename = "/var/log/lighttpd/info.mirror.slitaz.org-access.log"
+#  include "awstats.conf"
+#}
+
+$HTTP["host"] =~ "ajaxterm\.slitaz\.org$" {
+  proxy.server = ( "/" => 
+  	( ( "host" => "127.0.0.1", "port" => 8022 ) )
+  )
+}
+
+# pizza.slitaz.org (Server canonical hostname)
+#
+$HTTP["host"] =~ "^pizza\.slitaz\.org$" {
+  server.document-root = "/var/www/pizza"
+  server.errorlog = "/var/log/lighttpd/pizza.slitaz.org-error.log"
+  accesslog.filename = "/var/log/lighttpd/pizza.slitaz.org-access.log"
+  include "awstats.conf"
+  index-file.names += ( "index.php" )
+}
+
+# slitaz.org
+#
+#$HTTP["host"] =~ "(^|www\.)slitaz\.org$" {
+$HTTP["host"] =~ "www\.slitaz\.org$" {
+  server.document-root = "/home/slitaz/website"
+  server.errorlog = "/var/log/lighttpd/slitaz.org-error.log"
+  accesslog.filename = "/var/log/lighttpd/slitaz.org-access.log"
+  include "awstats.conf"
+  
+###  index-file.names = ( "index.html" )
+  index-file.names += ( "start.html" )
+  
+  
+###  url.rewrite-once = (
+###    "^/about" => "/fr/about",
+###	"^/artwork" => "/fr/artwork",
+###	"^/devel" => "/fr/devel",
+###    "^/doc" => "/fr/doc",
+###	"^/get" => "/fr/get",
+###	"^/packages" => "/fr/packages"
+###  )
+ 
+}
+
+# doc.slitaz.org
+#
+$HTTP["host"] =~ "doc\.slitaz\.org$" {
+  server.document-root = "/var/www/doc"
+  server.errorlog = "/var/log/lighttpd/doc.slitaz.org-error.log"
+  accesslog.filename = "/var/log/lighttpd/doc.slitaz.org-access.log"
+  index-file.names = ("doku.php")
+  var.dokudir = ""
+  # Rewrites for dokuwiki
+  url.rewrite = (
+    "^" + var.dokudir + "/lib/.*$"              => "$0",
+     "^" + var.dokudir + "/_media/(.*)?\?(.*)$"  => var.dokudir + "/lib/exe/fetch.php?media=$1&$2",
+     "^" + var.dokudir + "/_media/(.*)$"         => var.dokudir + "/lib/exe/fetch.php?media=$1",
+     "^" + var.dokudir + "/_detail/(.*)?\?(.*)$" => var.dokudir + "/lib/exe/detail.php?media=$1&$2",
+     "^" + var.dokudir + "/_detail/(.*)?$"       => var.dokudir + "/lib/exe/detail.php?media=$1",
+     "^" + var.dokudir + "/_export/([^/]+)/(.*)\?(.*)$" => var.dokudir + "/doku.php?do=export_$1&id=$2&$3",
+     "^" + var.dokudir + "/_export/([^/]+)/(.*)" => var.dokudir + "/doku.php?do=export_$1&id=$2",
+     "^" + var.dokudir + "/doku.php.*"           => "$0",
+     "^" + var.dokudir + "/feed.php.*"           => "$0",
+     "^" + var.dokudir + "/(.*)\?(.*)"           => var.dokudir + "/doku.php?id=$1&$2",
+     "^" + var.dokudir + "/(.*)"                 => var.dokudir + "/doku.php?id=$1"
+  )
+}
+
+# boot.slitaz.org
+#
+$HTTP["host"] =~ "boot\.slitaz\.org$" {
+  server.document-root = "/var/www/boot"
+  server.errorlog = "/var/log/lighttpd/boot.slitaz.org-error.log"
+  accesslog.filename = "/var/log/lighttpd/boot.slitaz.org-access.log"
+}
+
+# pkgs.slitaz.org
+#
+$HTTP["host"] =~ "pkgs\.slitaz\.org$" {
+  server.document-root = "/var/www/pkgs"
+  server.errorlog = "/var/log/lighttpd/pkgs.slitaz.org-error.log"
+  accesslog.filename = "/var/log/lighttpd/pkgs.slitaz.org-access.log"
+  index-file.names += ( "search.sh" )
+  cgi.assign = (
+    ".sh" => "/bin/sh"
+  )
+}
+
+# hg.slitaz.org (Mercurial repos)
+#
+$HTTP["host"] =~ "hg\.slitaz\.org" {
+  cgi.assign = (
+    ".py" => "/usr/bin/python"
+  )
+  server.document-root = "/var/www/hg"
+#  url.rewrite-once = ( "(.*)" => "/hgwebdir.py$1" )
+  index-file.names += ( "hgwebdir.py" )
+}
+
diff -r a6137e640e01 -r bea570b9faaa mirror-tools/stuff/home/backups/mirror/backup.sh
--- a/mirror-tools/stuff/home/backups/mirror/backup.sh	Thu Nov 18 09:56:09 2010 +0100
+++ b/mirror-tools/stuff/home/backups/mirror/backup.sh	Thu Nov 18 10:21:49 2010 +0100
@@ -7,12 +7,19 @@
 
 backup_data()
 {
+GZIP=rgzip
+which $GZIP > /dev/null || GZIP=gzip
+echo "Sync doc.slitaz.org ..."
+rsync -aH -e "$SSH" --bwlimit=50 \
+  $REMOTE_USER@tank.slitaz.org:/home/slitaz/www/doc/data/. /var/www/doc/data/.
 while read file dirs; do
+	echo "Create $file.cpio.gz ..."
 	( cd / ; find $dirs  | cpio -o -H newc ) | \
-		rgzip -9 > $file.cpio.gz 2> /dev/null
+		$GZIP -9 > $file.cpio.gz 2> /dev/null
 done <<EOT
 etc		etc home/$BACKUP_USER/.ssh
 www		var/www/mirror-info var/www/pizza
+www2		var/www/boot /var/www/hg /var/www/pkgs /var/www/doc
 packages	var/lib/tazpkg/installed
 rrd		var/spool/rrd
 crontabs	var/spool/cron/crontabs
@@ -24,11 +31,12 @@
 # The following should be kept untouched.
 #
 
-SSH="ssh -i /home/$BACKUP_USER/.ssh/id_rsa"
+SSH="ssh -i /home/$BACKUP_USER/.ssh/id_rsa -o PasswordAuthentication=no"
 
 cd $(dirname $0)
 [ $(id -u) == 0 ] || exit 1
-[ $(hostname) == $(basename $PWD) ] || exit 1
+[ $(hostname) == $(basename $PWD) -o \
+  $(hostname) == $(basename $PWD).slitaz.org ] || exit 1
 
 rotate()
 {
@@ -62,12 +70,14 @@
 	done
 fi
 
+echo "Local backup for $(hostname) ..."
 backup_data
 
 chown $BACKUP_USER *
 chmod 700 *
 
 [ -n "$REMOTE_USER" ] && for i in $(cd .. ; ls); do
-	[ $i == $(hostname) ] && continue
+	[ $i == $(hostname) -o $i.slitaz.org == $(hostname) ] && continue
+	echo "Get backups from $i ..."
 	rsync -aH -e "$SSH" --bwlimit=50 $REMOTE_USER@$i.slitaz.org:/home/backups/$i/. ../$i/.
 done
diff -r a6137e640e01 -r bea570b9faaa mirror-tools/stuff/usr/bin/mkpkgiso
--- a/mirror-tools/stuff/usr/bin/mkpkgiso	Thu Nov 18 09:56:09 2010 +0100
+++ b/mirror-tools/stuff/usr/bin/mkpkgiso	Thu Nov 18 10:21:49 2010 +0100
@@ -52,7 +52,7 @@
 # Update hg repos
 if [ "$PKG_VER" == "update-hg" ]; then
 	for i in $1/* ; do
-		[ -s $i/.hg/hgrc ] || continue
+		grep -qs '\[paths]' $i/.hg/hgrc || continue
 		cd $i
 		hg pull
 		hg update
@@ -256,6 +256,9 @@
 EOF
 	fi;;
 --sources)
+	echo -n "Removing previous ISO..."
+	rm -f $OUTPUT
+	status
 	cat >>$TEMP_DIR/install.sh<<EOF
 mkdir -p /home/slitaz
 ln -s \$DIR/src /home/slitaz
diff -r a6137e640e01 -r bea570b9faaa mirror-tools/stuff/var/www/mirror-info/index.php
--- a/mirror-tools/stuff/var/www/mirror-info/index.php	Thu Nov 18 09:56:09 2010 +0100
+++ b/mirror-tools/stuff/var/www/mirror-info/index.php	Thu Nov 18 10:21:49 2010 +0100
@@ -38,6 +38,7 @@
 <h4>SliTaz Network</h4>
 <ul>
 	<li><a href="http://www.slitaz.org/">Main Website</a></li>
+	<li><a href="http://doc.slitaz.org/">Documentation</a></li>
 	<li><a href="http://forum.slitaz.org/">Community Forum</a></li>
 	<li><a href="http://community.slitaz.org/">Community Platform</a></li>
 	<li><a href="http://labs.slitaz.org/">SliTaz Laboratories</a></li>
@@ -143,6 +144,8 @@
 <ul>
 	<li><a href="http://mirror.slitaz.org/www/">www.slitaz.org</a> - SliTaz Website.
 	(<a href="http://www.slitaz.org/" target="_blank">main</a>)</li>
+	<li><a href="http://mirror.slitaz.org/doc/">doc.slitaz.org</a> - Documentation.
+	(<a href="http://doc.slitaz.org/" target="_blank">main</a>)</li>
 	<li><a href="http://mirror.slitaz.org/pkgs/">pkgs.slitaz.org</a> - Packages Web interface.
 	(<a href="http://pkgs.slitaz.org/" target="_blank">main</a>)</li>
 	<li><a href="http://mirror.slitaz.org/hg/">hg.slitaz.org</a> - Mercurial repositories (read only).
@@ -156,26 +159,29 @@
 <h3><a href="http://mirror.slitaz.org/awstats.pl?config=rsync" target="_blank">
 	<img title="Secondary mirrors" src="pics/website/vhosts.png" 
 	 alt="mirrors" /></a>Mirrors</h3>
-	These mirrors are updated using the url: <b>rsync://mirror.slitaz.org/slitaz/</b>
+	Most mirrors are updated using the url: <b>rsync://mirror.slitaz.org/slitaz/</b>
 	(<a href="http://mirror.slitaz.org/awstats.pl?config=rsync">stats</a>)
 <ul>
 	<li><a href="http://en.utrace.de/?query=mirror.switch.ch">
 		<img title="map" src="pics/website/ch.png" alt="map" /></a>
 		<a href="http://mirror.switch.ch/ftp/mirror/slitaz/">
 		http://mirror.switch.ch/ftp/mirror/slitaz/</a> or
-		<a href="ftp://mirror.switch.ch/mirror/slitaz/">
-		ftp://mirror.switch.ch/mirror/slitaz/</a></li>
+		<a href="ftp://mirror.switch.ch/mirror/slitaz/">ftp</a></li>
 	<li><a href="http://en.utrace.de/?query=www.gtlib.gatech.edu">
 		<img title="map" src="pics/website/us.png" alt="map" /></a>
 		<a href="http://www.gtlib.gatech.edu/pub/slitaz/">
 		http://www.gtlib.gatech.edu/pub/slitaz/</a> or
-		<a href="ftp://ftp.gtlib.gatech.edu/pub/slitaz/">
-		ftp://ftp.gtlib.gatech.edu/pub/slitaz/</a></li>
+		<a href="ftp://ftp.gtlib.gatech.edu/pub/slitaz/">ftp</a> or
+		<a href="rsync://www.gtlib.gatech.edu/slitaz/">rsync</a></li>
 	<li><a href="http://en.utrace.de/?query=download.tuxfamily.org">
 		<img title="map" src="pics/website/fr.png" alt="map" /></a>
 		<a href="http://download.tuxfamily.org/slitaz/">
-		http://download.tuxfamily.org/slitaz/</a></li>
+		http://download.tuxfamily.org/slitaz/</a> or
+		<a href="ftp://download.tuxfamily.org/slitaz/">ftp</a> or
+		<a href="rsync://download.tuxfamily.org/pub/slitaz/">rsync</a></li>
 	<!-- li><a href="http://www.linuxembarque.com/slitaz/mirror/">
+		<img title="map" src="pics/website/fr.png" alt="map" /></a>
+		<a href="http://www.linuxembarque.com/slitaz/mirror/">
 		http://www.linuxembarque.com/slitaz/mirror/</a></li -->
 	<li><a href="http://en.utrace.de/?query=mirror.lupaworld.com">
 		<img title="map" src="pics/website/cn.png" alt="map" /></a>
@@ -185,12 +191,14 @@
 		<img title="map" src="pics/website/br.png" alt="map" /></a>
 		<a href="http://slitaz.c3sl.ufpr.br/">
 		http://slitaz.c3sl.ufpr.br/</a> or
-		<a href="ftp://slitaz.c3sl.ufpr.br/slitaz/">
-		ftp://slitaz.c3sl.ufpr.br/slitaz/</a></li>
+		<a href="ftp://slitaz.c3sl.ufpr.br/slitaz/">ftp</a> or
+		<a href="rsync://slitaz.c3sl.ufpr.br/slitaz/">rsync</a></li>
 	<li><a href="http://en.utrace.de/?query=slitaz.mirror.garr.it">
 		<img title="map" src="pics/website/it.png" alt="map" /></a>
 		<a href="http://slitaz.mirror.garr.it/mirrors/slitaz/">
-		http://slitaz.mirror.garr.it/mirrors/slitaz/</a></li>
+		http://slitaz.mirror.garr.it/mirrors/slitaz/</a> or
+		<a href="ftp://slitaz.mirror.garr.it/mirrors/slitaz/">ftp</a> or
+		<a href="rsync://slitaz.mirror.garr.it/mirrors/slitaz/">rsync</a></li>
 	<!-- li><a href="http://mirror.drustvo-dns.si/slitaz/">
 		http://mirror.drustvo-dns.si/slitaz/</a></li -->
 	<li><a href="http://en.utrace.de/?query=ftp.pina.si">
@@ -200,11 +208,26 @@
 	<li><a href="http://en.utrace.de/?query=distro.ibiblio.org">
 		<img title="map" src="pics/website/us.png" alt="map" /></a>
 		<a href="http://distro.ibiblio.org/pub/linux/distributions/slitaz/">
-		http://distro.ibiblio.org/pub/linux/distributions/slitaz/</a></li>
+		http://distro.ibiblio.org/pub/linux/distributions/slitaz/</a> or
+		<a href="ftp://distro.ibiblio.org/pub/linux/distributions/slitaz/">ftp</a></li>
 	<li><a href="http://en.utrace.de/?query=ftp.vim.org">
 		<img title="map" src="pics/website/nl.png" alt="map" /></a>
 		<a href="http://ftp.vim.org/ftp/os/Linux/distr/slitaz/">
-		http://ftp.vim.org/ftp/os/Linux/distr/slitaz/</a></li>
+		http://ftp.vim.org/ftp/os/Linux/distr/slitaz/</a> or
+		<a href="ftp://ftp.vim.org/mirror/os/Linux/distr/slitaz/">
+		ftp</a></li>
+	<li><a href="http://en.utrace.de/?query=ftp.nedit.org">
+		<img title="map" src="pics/website/nl.png" alt="map" /></a>
+		<a href="http://ftp.nedit.org/ftp/ftp/pub/os/Linux/distr/slitaz/">
+		http://ftp.nedit.org/ftp/ftp/pub/os/Linux/distr/slitaz/</a> or
+		<a href="ftp://ftp.nedit.org/ftp/ftp/pub/os/Linux/distr/slitaz/">
+		ftp</a></li>
+	<li><a href="http://en.utrace.de/?query=ftp.ch.xemacs.org">
+		<img title="map" src="pics/website/ch.png" alt="map" /></a>
+		<a href="http://ftp.ch.xemacs.org/ftp/pool/2/mirror/slitaz/" />
+		http://ftp.ch.xemacs.org/ftp/pool/2/mirror/slitaz/</a> or
+		<a href="ftp://ftp.ch.xemacs.org//pool/2/mirror/slitaz/" />
+		ftp</a></li>
 </ul>
 
 <a name="builds"></a>
@@ -212,10 +235,12 @@
     Daily builds</h3>
 
 <?php
-function display_log($file,$anchor)
+function display_log($file,$anchor,$url)
 {
 echo '<a name="'.$anchor.'"></a>';
+echo "<a href=\"$url\">";
 system("stat -c '<h4>%y %n</h4>' ".$file." | sed -e 's/.000000000//' -e 's|/var/log/\(.*\).log|\\1.iso|'");
+echo "</a>";
 echo "<pre>";
 system("cat ".$file." | sed -e 's/.\[[0-9][^mG]*.//g' | awk '".
 '{ if (/\[/) { n=index($0,"["); printf("%s%s%s\n",substr($0,1,n-1),'.
@@ -223,9 +248,8 @@
 echo "</pre>";
 }
 
-display_log("/var/log/packages-stable.log", "buildstable" );
-display_log("/var/log/packages-cooking.log","buildcooking");
-display_log("/var/log/sources-cooking.log", "buildsources");
+display_log("/var/log/packages-stable.log", "buildstable", "/iso/stable/packages-3.0.iso");
+display_log("/var/log/packages-cooking.log","buildcooking","/iso/cooking/packages-cooking.iso");
 ?>
 <!-- End of content with round corner -->
 </div>