slitaz-modular rev 156
initramfs: Fixed local-mirror. Add a echo to fake-website to tell what website is being build.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Sat Dec 24 20:46:19 2011 +0000 (2011-12-24) |
| parents | a4df52f75723 |
| children | b8a5e6854be8 |
| files | initramfs/etc/lighttpd/vhosts-local-tank.conf initramfs/etc/lighttpd/vhosts-local.conf initramfs/etc/local-mirror.conf initramfs/linuxrc initramfs/usr/bin/fake-website initramfs/usr/bin/local-mirror |
line diff
1.1 --- a/initramfs/etc/lighttpd/vhosts-local-tank.conf Sat Dec 24 17:10:30 2011 +0000 1.2 +++ b/initramfs/etc/lighttpd/vhosts-local-tank.conf Sat Dec 24 20:46:19 2011 +0000 1.3 @@ -227,65 +227,3 @@ 1.4 server.errorlog = "/var/log/lighttpd/pizza.slitaz.org-error.log" 1.5 accesslog.filename = "/var/log/lighttpd/pizza.slitaz.org-access.log" 1.6 } 1.7 - 1.8 -# lfs.slitaz.org (Linux From Scratch docs) 1.9 -# 1.10 -$HTTP["host"] =~ "lfs\.slitaz\.org$" { 1.11 - server.document-root = "/home/slitaz/www/lfs" 1.12 - server.errorlog = "/var/log/lighttpd/lfs.slitaz.org-error.log" 1.13 - accesslog.filename = "/var/log/lighttpd/lfs.slitaz.org-access.log" 1.14 -} 1.15 - 1.16 -# absguide.slitaz.org (Advanced Bash-Scripting Guide docs) 1.17 -# 1.18 -$HTTP["host"] =~ "absguide\.slitaz\.org$" { 1.19 - server.document-root = "/home/slitaz/www/absguide" 1.20 - server.errorlog = "/var/log/lighttpd/absguide.slitaz.org-error.log" 1.21 - accesslog.filename = "/var/log/lighttpd/absguide.slitaz.org-access.log" 1.22 -} 1.23 - 1.24 -# hgbook.slitaz.org (Mercurial: The Definitve Guide docs) 1.25 -# 1.26 -$HTTP["host"] =~ "hgbook\.slitaz\.org$" { 1.27 - server.document-root = "/home/slitaz/www/hgbook" 1.28 - server.errorlog = "/var/log/lighttpd/hgbook.slitaz.org-error.log" 1.29 - accesslog.filename = "/var/log/lighttpd/hgbook.slitaz.org-access.log" 1.30 -} 1.31 - 1.32 -# gimp.en.slitaz.org (gimp English docs) 1.33 -# 1.34 -$HTTP["host"] =~ "gimp\.en\.slitaz\.org$" { 1.35 - server.document-root = "/home/slitaz/www/gimp_en" 1.36 - server.errorlog = "/var/log/lighttpd/gimp.en.slitaz.org-error.log" 1.37 - accesslog.filename = "/var/log/lighttpd/gimp.en.slitaz.org-access.log" 1.38 -} 1.39 - 1.40 -# gimp.es.slitaz.org (gimp Spanish docs) 1.41 -# 1.42 -$HTTP["host"] =~ "gimp\.es\.slitaz\.org$" { 1.43 - server.document-root = "/home/slitaz/www/gimp_es" 1.44 - server.errorlog = "/var/log/lighttpd/gimp.es.slitaz.org-error.log" 1.45 - accesslog.filename = "/var/log/lighttpd/gimp.es.slitaz.org-access.log" 1.46 -} 1.47 - 1.48 -# gimp.fr.slitaz.org (gimp French docs) 1.49 -# 1.50 -$HTTP["host"] =~ "gimp\.fr\.slitaz\.org$" { 1.51 - server.document-root = "/home/slitaz/www/gimp_fr" 1.52 - server.errorlog = "/var/log/lighttpd/gimp.fr.slitaz.org-error.log" 1.53 - accesslog.filename = "/var/log/lighttpd/gimp.fr.slitaz.org-access.log" 1.54 -} 1.55 - 1.56 -# man-html.slitaz.org 1.57 -# 1.58 -$HTTP["host"] =~ "man-html\.slitaz\.org$" { 1.59 - server.document-root = "/home/slitaz/www/man-html" 1.60 - server.errorlog = "/var/log/lighttpd/man-html.slitaz.org-error.log" 1.61 - accesslog.filename = "/var/log/lighttpd/man-html.slitaz.org-access.log" 1.62 -} 1.63 - 1.64 -$HTTP["host"] =~ "lg\.slitaz\.org$" { 1.65 - server.document-root = "/home/slitaz/www/linuxgazette" 1.66 - server.errorlog = "/var/log/lighttpd/lg.slitaz.org-error.log" 1.67 - accesslog.filename = "/var/log/lighttpd/lg.slitaz.org-access.log" 1.68 -}
2.1 --- a/initramfs/etc/lighttpd/vhosts-local.conf Sat Dec 24 17:10:30 2011 +0000 2.2 +++ b/initramfs/etc/lighttpd/vhosts-local.conf Sat Dec 24 20:46:19 2011 +0000 2.3 @@ -1,3 +1,3 @@ 2.4 2.5 include "vhosts-local-tank.conf" 2.6 -include "vhosts-local-mirror.conf" 2.7 \ No newline at end of file 2.8 +include "vhosts-local-mirror.conf"
3.1 --- a/initramfs/etc/local-mirror.conf Sat Dec 24 17:10:30 2011 +0000 3.2 +++ b/initramfs/etc/local-mirror.conf Sat Dec 24 20:46:19 2011 +0000 3.3 @@ -5,14 +5,13 @@ 3.4 tazwok slitaz-dev-tools website wok wok-stable wok-tiny \ 3.5 wok-undigest wok-tank my-cookutils" 3.6 WWW="website people doc pizza cook pkgs mirror boot tank hg \ 3.7 -lfs absguide man-html hgbook gimp.en gimp.fr gimp.es linuxgazette" 3.8 +lfs absguide man-html hgbook gimp.en gimp.fr gimp.es" 3.9 IP_ADDR="127.0.0.1" 3.10 ROUTER_IP="192.168.1.1" 3.11 ADDRESS="www.slitaz.org pizza.slitaz.org boot.slitaz.org \ 3.12 mirror.slitaz.org tank.slitaz.org doc.slitaz.org \ 3.13 -pkgs.slitaz.org hg.slitaz.org cook.slitaz.org man-html.slitaz.org \ 3.14 -people.slitaz.org lfs.slitaz.org absguide.slitaz.org hgbook.slitaz.org \ 3.15 -gimp.en.slitaz.org gimp.es.slitaz.org gimp.fr.slitaz.org lg.slitaz.org" 3.16 +pkgs.slitaz.org hg.slitaz.org cook.slitaz.org \ 3.17 +people.slitaz.org" 3.18 VHOST_FILE="/etc/lighttpd/vhosts-local.conf" 3.19 VHOST_MIRROR_FILE="/etc/lighttpd/vhosts-local-mirror.conf" 3.20 VHOST_TANK_FILE="/etc/lighttpd/vhosts-local-tank.conf"
4.1 --- a/initramfs/linuxrc Sat Dec 24 17:10:30 2011 +0000 4.2 +++ b/initramfs/linuxrc Sat Dec 24 20:46:19 2011 +0000 4.3 @@ -11,6 +11,8 @@ 4.4 4.5 . /liblinuxlive # it requires proc to be mounted 4.6 4.7 +depmod -a 4.8 + 4.9 # Don't print kernel messages to konsole now. 4.10 # Syslog will reset printk settings, no need to remember it here anymore. 4.11 echo "0" >/proc/sys/kernel/printk
5.1 --- a/initramfs/usr/bin/fake-website Sat Dec 24 17:10:30 2011 +0000 5.2 +++ b/initramfs/usr/bin/fake-website Sat Dec 24 20:46:19 2011 +0000 5.3 @@ -19,6 +19,7 @@ 5.4 [ ! -d "$DIR" ] && usage 5.5 [ "$DIR" = "" -o "$WEB_ADDRESS" = "" ] && usage 5.6 5.7 +echo "building $WEB_ADDRESS site" 5.8 [ -d $MAIN_WWW_DIR ] || mkdir -p $MAIN_WWW_DIR 5.9 if [ -d $DIR ]; then 5.10 [ -d $MAIN_WWW_DIR/$(basename $DIR) ] || ln -sf $DIR $MAIN_WWW_DIR/$(basename $DIR)
6.1 --- a/initramfs/usr/bin/local-mirror Sat Dec 24 17:10:30 2011 +0000 6.2 +++ b/initramfs/usr/bin/local-mirror Sat Dec 24 20:46:19 2011 +0000 6.3 @@ -294,7 +294,7 @@ 6.4 #if [ -d /usr/share/man-html ]; then 6.5 # [ -d $MAIN_WWW_DIR/man-html ] || ln -sf /usr/share/man-html $MAIN_WWW_DIR/man-html 6.6 #fi ;; 6.7 - fake-website /usr/share/mam-html man-html.slitaz.org ;; 6.8 + fake-website /usr/share/man-html man-html.slitaz.org ;; 6.9 gimp.en) 6.10 #if [ -d /usr/share/gimp/2.0/help/en ]; then 6.11 # [ -d $MAIN_WWW_DIR/gimp_en ] || ln -sf /usr/share/gimp/2.0/help/en $MAIN_WWW_DIR/gimp_en 6.12 @@ -314,7 +314,7 @@ 6.13 #if [ -d /repos/linuxgazette ]; then 6.14 # [ -d $MAIN_WWW_DIR/linuxgazette ] || ln -sf /repos/linuxgazette $MAIN_WWW_DIR/linuxgazette 6.15 #fi ;; 6.16 - fake-website /repos/linuxgazette linuxgazette.net 6.17 + fake-website /repos/linuxgazette linuxgazette.net ;; 6.18 esac 6.19 } 6.20