# HG changeset patch # User Christopher Rogers # Date 1314470077 0 # Node ID 12a8156049fc9560d81f8f750f1bd9b10024589a # Parent 2d0d25925042a5925eab1953b9616118c7245d9e local-mirror: Add support for more doc urls. New urls are: hgbook.slitaz.org, absguide.slitaz.org, gimp.en.slitaz.org, gimp.es.slitaz.org, and gimp.fr.slitaz.org. diff -r 2d0d25925042 -r 12a8156049fc initramfs/etc/lighttpd/vhosts-local-tank.conf --- a/initramfs/etc/lighttpd/vhosts-local-tank.conf Sat Aug 27 18:30:55 2011 +0000 +++ b/initramfs/etc/lighttpd/vhosts-local-tank.conf Sat Aug 27 18:34:37 2011 +0000 @@ -231,3 +231,43 @@ server.errorlog = "/var/log/lighttpd/lfs.slitaz.org-error.log" accesslog.filename = "/var/log/lighttpd/lfs.slitaz.org-access.log" } + +# absguide.slitaz.org (Advanced Bash-Scripting Guide docs) +# +$HTTP["host"] =~ "absguide\.slitaz\.org$" { + server.document-root = "/home/slitaz/www/absguide" + server.errorlog = "/var/log/lighttpd/absguide.slitaz.org-error.log" + accesslog.filename = "/var/log/lighttpd/absguide.slitaz.org-access.log" +} + +# hgbook.slitaz.org (Mercurial: The Definitve Guide docs) +# +$HTTP["host"] =~ "hgbook\.slitaz\.org$" { + server.document-root = "/home/slitaz/www/hgbook" + server.errorlog = "/var/log/lighttpd/hgbook.slitaz.org-error.log" + accesslog.filename = "/var/log/lighttpd/hgbook.slitaz.org-access.log" +} + +# gimp.en.slitaz.org (gimp English docs) +# +$HTTP["host"] =~ "gimp\.en\.slitaz\.org$" { + server.document-root = "/home/slitaz/www/gimp_en" + server.errorlog = "/var/log/lighttpd/gimp.en.slitaz.org-error.log" + accesslog.filename = "/var/log/lighttpd/gimp.en.slitaz.org-access.log" +} + +# gimp.es.slitaz.org (gimp Spanish docs) +# +$HTTP["host"] =~ "gimp\.es\.slitaz\.org$" { + server.document-root = "/home/slitaz/www/gimp_es" + server.errorlog = "/var/log/lighttpd/gimp.es.slitaz.org-error.log" + accesslog.filename = "/var/log/lighttpd/gimp.es.slitaz.org-access.log" +} + +# gimp.fr.slitaz.org (gimp French docs) +# +$HTTP["host"] =~ "gimp\.fr\.slitaz\.org$" { + server.document-root = "/home/slitaz/www/gimp_fr" + server.errorlog = "/var/log/lighttpd/gimp.fr.slitaz.org-error.log" + accesslog.filename = "/var/log/lighttpd/gimp.fr.slitaz.org-access.log" +} diff -r 2d0d25925042 -r 12a8156049fc initramfs/etc/local-mirror.conf --- a/initramfs/etc/local-mirror.conf Sat Aug 27 18:30:55 2011 +0000 +++ b/initramfs/etc/local-mirror.conf Sat Aug 27 18:34:37 2011 +0000 @@ -4,12 +4,15 @@ slitaz-tools slitaz-vz ssfs tazlito tazpanel tazpkg tazusb \ tazwok slitaz-dev-tools website wok wok-stable wok-tiny \ wok-undigest wok-tank my-cookutils" -WWW="website people doc pizza cook pkgs mirror boot tank hg lfs" +WWW="website people doc pizza cook pkgs mirror boot tank hg \ +lfs absguide hgbook gimp.en gimp.fr gimp.es" IP_ADDR="127.0.0.1" ROUTER_IP="192.168.1.1" ADDRESS="www.slitaz.org pizza.slitaz.org boot.slitaz.org \ mirror.slitaz.org tank.slitaz.org doc.slitaz.org \ -pkgs.slitaz.org hg.slitaz.org cook.slitaz.org people.slitaz.org lfs.slitaz.org" +pkgs.slitaz.org hg.slitaz.org cook.slitaz.org \ +people.slitaz.org lfs.slitaz.org absguide.slitaz.org hgbook.slitaz.org \ +gimp.en.slitaz.org gimp.es.slitaz.org gimp.fr.slitaz.org" VHOST_FILE="/etc/lighttpd/vhosts-local.conf" VHOST_MIRROR_FILE="/etc/lighttpd/vhosts-local-mirror.conf" VHOST_TANK_FILE="/etc/lighttpd/vhosts-local-tank.conf" diff -r 2d0d25925042 -r 12a8156049fc initramfs/usr/bin/local-mirror --- a/initramfs/usr/bin/local-mirror Sat Aug 27 18:30:55 2011 +0000 +++ b/initramfs/usr/bin/local-mirror Sat Aug 27 18:34:37 2011 +0000 @@ -255,8 +255,27 @@ #[ -f /etc/mercurial/hgweb.conf ] && sed -i 's|style = slitaz|style = gitweb|g' /etc/mercurial/hgweb.config ;; lfs) - [ -d $MAIN_WWW_DIR/lfs ] || ln -sf /usr/share/doc/lfs-book $MAIN_WWW_DIR/lfs - ;; + [ -d $MAIN_WWW_DIR/lfs ] || ln -sf /usr/share/doc/lfs-book $MAIN_WWW_DIR/lfs ;; + hgbook) + if [ -d /usr/share/hgbook ]; then + [ -d $MAIN_WWW_DIR/hgbook ] || ln -sf /usr/share/hgbook $MAIN_WWW_DIR/hgbook + fi ;; + absguide) + if [ -d /usr/share/absguide ]; then + [ -d $MAIN_WWW_DIR/absguide ] || ln -sf /usr/share/absguide $MAIN_WWW_DIR/absguide + fi ;; + gimp.en) + if [ -d /usr/share/gimp/2.0/help/en ]; then + [ -d $MAIN_WWW_DIR/gimp_en ] || ln -sf /usr/share/gimp/2.0/help/en $MAIN_WWW_DIR/gimp_en + fi ;; + gimp.fr) + if [ -d /usr/share/gimp/2.0/help/fr ]; then + [ -d $MAIN_WWW_DIR/gimp_fr ] || ln -sf /usr/share/gimp/2.0/help/fr $MAIN_WWW_DIR/gimp_fr + fi ;; + gimp.es) + if [ -d /usr/share/gimp/2.0/help/es ]; then + [ -d $MAIN_WWW_DIR/gimp_es ] || ln -sf /usr/share/gimp/2.0/help/es $MAIN_WWW_DIR/gimp_es + fi ;; esac }