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

[nobody at svn.erp5.org]

Author: kevin
Date: Wed May 24 18:17:21 2006
New Revision: 7492

URL: http://svn.erp5.org?rev=7492&view=rev
Log:
Remove thttpd. According to Alex, thttpd come from DLS config where it acted as an alternate http server because kolab need to modify apache configuration at boot.
Remove Mandriva flavour hack (the problem was in custom /etc/sysconfig/system file).

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=7492&r1=7491&r2=7492&view=diff
==============================================================================
--- umigumi/trunk/config/erp5_cd.py (original)
+++ umigumi/trunk/config/erp5_cd.py Wed May 24 18:17:21 2006
@@ -69,9 +69,6 @@
   , 'chmod 0755 /etc/sysconfig/system'
   , 'chmod aug+x /etc/X11/prefdm'
   , 'chmod 0440 /etc/sudoers'
-  , 'chmod 0755 /var/www/thttpd/cgi-bin/index.cgi'
-  , 'chmod 0755 /var/www/thttpd/cgi-bin/reformat.cgi'
-  , 'chmod 0755 /var/www/thttpd/cgi-bin/image.cgi'
   , 'chmod 0755 /root/autoconf.py'
   , 'chmod 0755 /root/locale.pm'
   , 'chmod 0700 /root/config.xml'
@@ -99,6 +96,7 @@
   # 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'
+
   # disable apache on port 80
   , 'sed -i -e "s/Listen 80/#Listen 80 # Disabled in ERP5 LiveCD/" /etc/httpsd/conf/httpsd.conf'
 
@@ -145,13 +143,6 @@
   # 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'
-
-  # HACK: Delete Mandriva banners that not correspond to the "Free" version
-  # I don't know why, but sometimes it show "PowerPack" even if it's a Mandriva "Download edition"
-  , 'cd /usr/share/apps/kicker/pics/'
-  , 'rm -f kside_discovery.png     && ln -s kside_download.png kside_discovery.png'
-  , 'rm -f kside_powerpackplus.png && ln -s kside_download.png kside_powerpackplus.png'
-  , 'rm -f kside_powerpack.png     && ln -s kside_download.png kside_powerpack.png'
 
   # Be sure tun device is here to let OpenVpn work properly
   , 'mknod /dev/net/tun c 10 200'
@@ -191,7 +182,6 @@
 , 'openssh-clients', 'openssh-server'
 , 'ntp'
 , 'balance'
-, 'thttpd'
 , 'openvpn'
 , 'bacula-fd'
 , 'cadaver'