[Erp5-report] r13369 - /umigumi/trunk/config/erp5_cd.py

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Mar 12 17:22:04 2007
New Revision: 13369

URL: http://svn.erp5.org?rev=13369&view=rev
Log:
31th build.
Can't tweak service boot sequence by symlink manipulation since everything is LSB compliant now.
Fix wrong sed string of apache listining port.
Let apache follow symlinks from /var.
Fix apache permissions.
Add apache_mod_cache for further experimentations.

Modified:
    umigumi/trunk/config/erp5_cd.py

Modified: umigumi/trunk/config/erp5_cd.py
URL: http://svn.erp5.org/umigumi/trunk/config/erp5_cd.py?rev=13369&r1=13368&r2=13369&view=diff
==============================================================================
--- umigumi/trunk/config/erp5_cd.py (original)
+++ umigumi/trunk/config/erp5_cd.py Mon Mar 12 17:22:04 2007
@@ -27,7 +27,7 @@
 ### Metadatas
 description = """ERP5 LiveCD demonstrates the power of ERP5 the Open Source ERP Software by Nexedi."""
 canonical_name = 'ERP5 LiveCD'
-version = '1.0rc12-build29'
+version = '1.0rc12-build31'
 
 
 ### Kernels
@@ -80,28 +80,17 @@
   , 'chmod    0755  /usr/bin/zeoctl'
   , 'chmod -R 0700  /home/user/tmp'  # required by 'screen' to work
 
-  # Start dm later.
-  # This will give erp5cdtool service the time to do its job without being disturbed.
-  #, 'rm -f /etc/rc.d/rc5.d/S52dm'
-  #, 'ln -sn ../init.d/dm /etc/rc.d/rc5.d/S99dm'
-  # Launch oood at end
-  #, 'rm -f /etc/rc.d/rc2.d/S29oood'
-  #, 'rm -f /etc/rc.d/rc3.d/S29oood'
-  #, 'rm -f /etc/rc.d/rc4.d/S29oood'
-  #, 'rm -f /etc/rc.d/rc5.d/S29oood'
-  #, 'ln -sn /etc/rc.d/init.d/oood /etc/rc.d/rc2.d/S99oood'
-  #, 'ln -sn /etc/rc.d/init.d/oood /etc/rc.d/rc3.d/S99oood'
-  #, 'ln -sn /etc/rc.d/init.d/oood /etc/rc.d/rc4.d/S99oood'
-  #, 'ln -sn /etc/rc.d/init.d/oood /etc/rc.d/rc5.d/S99oood'
-
   # Better to use sed rather than custom files.
   , 'sed -i -e "s/^Country=.*/Country=us/" -e "s/^Language=.*/Language=en_US:en/" -e "s/^Charset=.*/Charset=iso10646-1/" /etc/kde/kdeglobals'
   , 'sed -i -e "s/^id:3:initdefault:/id:5:initdefault:/" /etc/inittab'
 
   # Let apache listen port 8080 to serve ERP5 Live CD wizard
-  , 'sed -i -e "s/Listen 0.0.0.0:80/0.0.0.0:8080/" /etc/httpd/conf/httpd.conf'
-  , 'chmod -R 0755          /var/www/cgi-bin/*'
-  , 'chown -R apache:apache /var/www/cgi-bin/*'
+  , 'sed -i -e "s/Listen 0.0.0.0:80/Listen 0.0.0.0:8080/" /etc/httpd/conf/httpd.conf'
+  # Because of the live CD mechanism, "/var/www" is a symlink to "/initrd/loopfs/var/www", so we have to allow symlinks from "/var".
+  , "echo '\n<Directory /var>\n  Options FollowSymLinks\n</Directory>' >> /etc/httpd/conf/httpd.conf"
+  # Fix some permissions
+  , 'chmod -R 0755        /var/www'
+  , 'chown -R root:apache /var/www'
 
   # Add XFree symbolic link to let mklivecd found nvidia_drv.o, libglx.so, fglrx_dri.so and fglrx_drv.o
   , 'ln -sf --target-directory=/usr/X11R6/bin/ ../../bin/Xorg'
@@ -109,6 +98,7 @@
   , 'ln -sf --target-directory=/usr/X11R6/lib/ ../../lib/xorg/modules'
 
   # Fix X keyboard
+  # XXX This seems to fix nothing. Maybe we should delete it...
   #, 'rm -rf /usr/X11R6/lib/X11/xkb/compiled'
   #, 'ln -sf /var/lib/xkb /usr/X11R6/lib/X11/xkb/compiled'
 
@@ -136,7 +126,7 @@
 
   # Store the current zope and mysql directories in /usr/share/erp5cdtool.
   , 'test -f /usr/share/erp5cdtool/mysql.orig.tgz || cd /var/lib && tar zcvf /usr/share/erp5cdtool/mysql.orig.tgz mysql && rm -rf mysql'
-  , 'test -f /usr/share/erp5cdtool/zope.orig.tgz || cd /var/lib && tar zcvf /usr/share/erp5cdtool/zope.orig.tgz zope && rm -rf zope'
+  , 'test -f /usr/share/erp5cdtool/zope.orig.tgz  || cd /var/lib && tar zcvf /usr/share/erp5cdtool/zope.orig.tgz zope   && rm -rf zope'
 
   # Be sure tun device is here to let OpenVpn work properly
   , 'mknod /dev/net/tun c 10 200'
@@ -317,7 +307,7 @@
 # Web Frontends
 , 'apache'
 , 'apache-mod_ssl'
-, 'apache-mod_proxy', 'apache-mod_disk_cache'
+, 'apache-mod_proxy', 'apache-mod_cache', 'apache-mod_disk_cache'
 )