Increased vdr nicelevel, add startlinks

[people/pmueller/ipfire-2.x.git] / lfs / apache2

diff --git a/lfs/apache2 b/lfs/apache2
index 7c5027a0e918d176df30beacad994a975641ffe5..309e0f24f256052761716df089945cac1efb2664 100644 (file)
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -47,7 +47,7 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch
 
-$(DL_FILE)_MD5 = 9c759a9744436de6a6aa2ddbc49d6e81
+$(DL_FILE)_MD5 = 203bea91715064f0c787f6499d33a377
 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
 
 install : $(TARGET)
@@ -82,12 +82,11 @@ ifeq "$(PASS)" "C"
 
        cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf
        ln -sf $(CONFIG_ROOT)/main/hostname.conf /etc/httpd/conf/
-       -find /etc/httpd/conf -name .svn -exec rm -rf {} \;
 
        # Copy all html/cgi-bin files
-       mkdir -p /srv/web/ipfire/{cgi-bin,html/updatecache/{download,metadata}}
+       mkdir -p /srv/web/ipfire/{cgi-bin,html}
+       mkdir -p /var/updatecache/{download,metadata}
        cp -aR $(DIR_SRC)/html/* /srv/web/ipfire
-       -find /srv/web/ipfire -name .svn -exec rm -rf {} \;
 
        # Change CONFIG_ROOT in cgi-scripts
        for i in /srv/web/ipfire/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \
@@ -101,6 +100,7 @@ ifeq "$(PASS)" "C"
        chmod 755 /srv/web/ipfire/html /srv/web/ipfire/html/{index.cgi,redirect.cgi,dial.cgi,images,include,themes,themes/*,themes/*/*}
 else
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/httpd-2.2.2-config-1.patch
 
        ### Add IPFire's layout, too
        echo "# IPFire layout" >> $(DIR_APP)/config.layout