X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fapache2;h=5e886254694793fb355db4612de48d8b208d7430;hp=95817344bfd11cd2ae43a02ae1c24c97f90cecec;hb=HEAD;hpb=c8ead4a543859582497e107173c650cec4203d4f diff --git a/lfs/apache2 b/lfs/apache2 index 95817344b..5e8862546 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -1,32 +1,31 @@ ############################################################################### -# This file is part of the IPCop Firewall. # # # -# IPCop is free software; you can redistribute it and/or modify # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2014 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # +# the Free Software Foundation, either version 3 of the License, or # # (at your option) any later version. # # # -# IPCop is distributed in the hope that it will be useful, # +# This program is distributed in the hope that it will be useful, # # but WITHOUT ANY WARRANTY; without even the implied warranty of # # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # # GNU General Public License for more details. # # # # You should have received a copy of the GNU General Public License # -# along with IPCop; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Makefiles are based on LFSMake, which is # -# Copyright (C) 2002 Rod Roard # +# along with this program. If not, see . # # # ############################################################################### + ############################################################################### # Definitions ############################################################################### include Config -VER = 2.2.2 +VER = 2.2.27 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -48,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 = 8faef0decf3fa7e69b2568eb2105a3d8 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822 install : $(TARGET) @@ -83,24 +82,26 @@ 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 /home/httpd/{cgi-bin,html} - cp -aR $(DIR_SRC)/html/* /home/httpd - -find /home/httpd -name .svn -exec rm -rf {} \; - cp $(DIR_DL)/sflogo.png /home/httpd/html/images/ + mkdir -p /srv/web/ipfire/{cgi-bin,html} + mkdir -p /var/updatecache/{download,metadata} + cp -aR $(DIR_SRC)/html/* /srv/web/ipfire # Change CONFIG_ROOT in cgi-scripts - for i in /home/httpd/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \ + for i in /srv/web/ipfire/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \ if [ -f $$i ]; then \ sed -i "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" $$i; \ fi; \ done - chown -R root:root /home/httpd - chmod -R 755 /home/httpd/cgi-bin - chmod -R 644 /home/httpd/html - chmod 755 /home/httpd/html /home/httpd/html/{index.cgi,redirect.cgi,dial.cgi,images,include} + chown -R root:root /srv/web/ipfire + chmod -R 755 /srv/web/ipfire/cgi-bin + chmod -R 644 /srv/web/ipfire/html + chmod 755 /srv/web/ipfire/html /srv/web/ipfire/html/{index.cgi,redirect.cgi,dial.cgi,images,include,themes,themes/*,themes/*/*} + ln -svf ipfire /srv/web/ipfire/html/themes/ipfire-rounded + + # Reset permissions of redirect templates and theme directories + find /srv/web/ipfire/html/{redirect-templates,themes} -type d | xargs chmod -v 755 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 @@ -116,27 +117,27 @@ else echo " libexecdir: /usr/lib/apache" >> $(DIR_APP)/config.layout echo " mandir: /usr/share/man" >> $(DIR_APP)/config.layout echo " sysconfdir: /etc/httpd/conf" >> $(DIR_APP)/config.layout - echo " datadir: /home/httpd" >> $(DIR_APP)/config.layout + echo " datadir: /srv/web/ipfire" >> $(DIR_APP)/config.layout echo " installbuilddir: /usr/lib/apache/build" >> $(DIR_APP)/config.layout - echo " errordir: /home/httpd/error" >> $(DIR_APP)/config.layout - echo " iconsdir: /home/httpd/icons" >> $(DIR_APP)/config.layout - echo " htdocsdir: /home/httpd/htdocs" >> $(DIR_APP)/config.layout - echo " manualdir: /home/httpd/manual" >> $(DIR_APP)/config.layout - echo " cgidir: /home/httpd/cgi-bin" >> $(DIR_APP)/config.layout + echo " errordir: /srv/web/ipfire/error" >> $(DIR_APP)/config.layout + echo " iconsdir: /srv/web/ipfire/icons" >> $(DIR_APP)/config.layout + echo " htdocsdir: /srv/web/ipfire/htdocs" >> $(DIR_APP)/config.layout + echo " manualdir: /srv/web/ipfire/manual" >> $(DIR_APP)/config.layout + echo " cgidir: /srv/web/ipfire/cgi-bin" >> $(DIR_APP)/config.layout echo " includedir: /usr/include/apache" >> $(DIR_APP)/config.layout - echo " localstatedir: /home/httpd" >> $(DIR_APP)/config.layout + echo " localstatedir: /srv/web/ipfire" >> $(DIR_APP)/config.layout echo " runtimedir: /var/run" >> $(DIR_APP)/config.layout echo " logfiledir: /var/log/httpd" >> $(DIR_APP)/config.layout echo " proxycachedir: /var/cache/apache/proxy" >> $(DIR_APP)/config.layout echo "" >> $(DIR_APP)/config.layout cd $(DIR_APP) && ./configure --enable-layout=IPFire \ - --enable-ssl --enable-mods-shared=all + --enable-ssl --enable-mods-shared=all --enable-proxy cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install chown -v root:root /usr/lib/apache/httpd.exp \ /usr/sbin/{apxs,apachectl,dbmmanage,envvars{,-std}} \ - /usr/share/man/man1/{dbmmanage,ht{dbm,digest,passwd}}.1 \ + /usr/share/man/man1/{dbmmanage,ht{dbm,digest,passwd,txt2dbm}}.1 \ /usr/share/man/man8/{ab,apachectl,apxs,htcacheclean,httpd}.8 \ /usr/share/man/man8/{logresolve,rotatelogs,suexec}.8 @rm -rf $(DIR_APP)