Alle htdocs nach /srv/web verschoben...
authorms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Wed, 13 Dec 2006 19:56:41 +0000 (19:56 +0000)
committerms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Wed, 13 Dec 2006 19:56:41 +0000 (19:56 +0000)
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@363 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

12 files changed:
config/httpd/default-server.conf
config/httpd/vhosts.d/ipfire-interface-ssl.conf
config/httpd/vhosts.d/ipfire-interface.conf
lfs/GeoIP
lfs/apache [deleted file]
lfs/apache2
lfs/applejuice
lfs/rrdtool
lfs/squid-graph
lfs/squidguard
lfs/webcyradm
tools/make-functions

index 824176f..db08229 100644 (file)
@@ -3,6 +3,6 @@
 # deleted here, or overriden elswhere.
 #
 
-DocumentRoot /home/httpd/html
+DocumentRoot /srv/web/ipfire/html
 
 #Include /etc/httpd/conf/conf.d/*.conf
index 830d312..5a39e3e 100644 (file)
@@ -3,7 +3,7 @@
     RewriteEngine on
     RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK|OPTIONS)
     RewriteRule .* - [F]
-    DocumentRoot /home/httpd/html
+    DocumentRoot /srv/web/ipfire/html
     ServerAdmin root@localhost
     ErrorLog /var/log/httpd/error_log
     TransferLog /var/log/httpd/access_log
     SSLCipherSuite ALL:!ADH:!EXPORT56:!eNULL:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW:+EXP
     SSLCertificateFile /etc/httpd/server.crt
     SSLCertificateKeyFile /etc/httpd/server.key
-    <Directory /home/httpd/html>
+    <Directory /srv/web/ipfire/html>
         Options ExecCGI
         AllowOverride None
         Order allow,deny
         Allow from all
     </Directory>
-    <DirectoryMatch "/home/httpd/html/(graphs|sgraph)">
+    <DirectoryMatch "/srv/web/ipfire/html/(graphs|sgraph)">
         AuthName "IPFire - Restricted"
         AuthType Basic
         AuthUserFile /var/ipfire/auth/users
         Require user admin
     </DirectoryMatch>
-    ScriptAlias /cgi-bin/ /home/httpd/cgi-bin/
-    <Directory /home/httpd/cgi-bin>
+    ScriptAlias /cgi-bin/ /srv/web/ipfire/cgi-bin/
+    <Directory /srv/web/ipfire/cgi-bin>
         AllowOverride None
         Options None
         AuthName "IPFire - Restricted"
@@ -48,7 +48,7 @@
             Require user admin
         </Files>
     </Directory>
-    <Directory /home/httpd/cgi-bin/dial>
+    <Directory /srv/web/ipfire/cgi-bin/dial>
         AllowOverride None
         Options None
         AuthName "IPFire - Restricted"
@@ -59,7 +59,7 @@
     <Files ~ "\.(cgi|shtml?)$">
        SSLOptions +StdEnvVars
     </Files>
-    <Directory /home/httpd/cgi-bin>
+    <Directory /srv/web/ipfire/cgi-bin>
        SSLOptions +StdEnvVars
     </Directory>
     SetEnv HOME /home/nobody
index 85dea4c..604802f 100644 (file)
@@ -1,25 +1,25 @@
 <VirtualHost *:81>
 
-    DocumentRoot /home/httpd/html
+    DocumentRoot /srv/web/ipfire/html
 
     RewriteEngine on
     RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK|OPTIONS)
     RewriteRule .* - [F]
 
-    <Directory /home/httpd/html>
+    <Directory /srv/web/ipfire/html>
         Options ExecCGI
         AllowOverride None
         Order allow,deny
         Allow from all
     </Directory>
-    <DirectoryMatch "/home/httpd/html/(graphs|sgraph)">
+    <DirectoryMatch "/srv/web/ipfire/html/(graphs|sgraph)">
         AuthName "IPFire - Restricted"
         AuthType Basic
         AuthUserFile /var/ipfire/auth/users
         Require user admin
     </DirectoryMatch>
-    ScriptAlias /cgi-bin/ /home/httpd/cgi-bin/
-    <Directory /home/httpd/cgi-bin>
+    ScriptAlias /cgi-bin/ /srv/web/ipfire/cgi-bin/
+    <Directory /srv/web/ipfire/cgi-bin>
         AllowOverride None
         Options None
         AuthName "IPFire - Restricted"
@@ -42,7 +42,7 @@
             Require user admin
         </Files>
     </Directory>
-    <Directory /home/httpd/cgi-bin/dial>
+    <Directory /srv/web/ipfire/cgi-bin/dial>
         AllowOverride None
         Options None
         AuthName "IPFire - Restricted"
index de42bd8..f56de19 100644 (file)
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -54,9 +54,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-#dist: 
-#      make-packages.sh GeoIP $(THISAPP)-ipfire-beta-1
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -80,7 +77,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && perl Makefile.PL
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
-       cd $(DIR_APP) && mkdir -p /usr/local/share/GeoIP && cp -f $(DIR_DL)/GeoIP.dat /usr/local/share/GeoIP/GeoIP.dat
-       cd $(DIR_APP) && chmod 777 /home/httpd/html/images/flags
+       cd $(DIR_APP) && mkdir -p /usr/local/share/GeoIP && \
+               cp -f $(DIR_DL)/GeoIP.dat /usr/local/share/GeoIP/GeoIP.dat
+       cd $(DIR_APP) && chmod 777 /srv/web/ipfire/html/images/flags
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --git a/lfs/apache b/lfs/apache
deleted file mode 100644 (file)
index ec5b0dd..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall.                                    #
-#                                                                             #
-# IPCop 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           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# IPCop 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 <rod@sunsetsystems.com>                        #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.3.34
-
-THISAPP    = apache_$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE) mod_ssl-2.8.25-1.3.34.tar.gz mm-1.4.0.tar.gz sflogo.png
-
-$(DL_FILE)                        = $(DL_FROM)/$(DL_FILE)
-mod_ssl-2.8.25-1.3.34.tar.gz      = http://www.modssl.org/source/mod_ssl-2.8.25-1.3.34.tar.gz
-mm-1.4.0.tar.gz                   = ftp://ftp.ossp.org/pkg/lib/mm/mm-1.4.0.tar.gz
-sflogo.png                        = http://sflogo.sourceforge.net/sflogo.php?group_id=40604
-
-$(DL_FILE)_MD5                    = 9978cc552b423f0015c1052d23ab619e
-mod_ssl-2.8.25-1.3.34.tar.gz_MD5  = 1ef2a6cb47573444779b2fd10502514b
-mm-1.4.0.tar.gz_MD5               = 393b0891a889a4e9f9481d18d976366c
-sflogo.png_MD5                    = 9fe4d709a2bae05a34e6c070c8a0448e
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) $(DIR_SRC)/mm-* $(DIR_SRC)/mod_* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       rm -rf /home/httpd/cgi-bin
-
-       # MM
-       cd $(DIR_SRC) && tar xfz $(DIR_DL)/mm-1.4.0.tar.gz
-       cd $(DIR_SRC)/mm-1.4.0 && ./configure --disable-shared
-       cd $(DIR_SRC)/mm-1.4.0 && make
-
-       # Mod_ssl
-       cd $(DIR_SRC) && tar xfz $(DIR_DL)/mod_ssl-2.8.25-1.3.34.tar.gz
-       cd $(DIR_SRC)/mod_ssl-2.8.25-1.3.34 && ./configure --with-apache=$(DIR_APP)
-
-       # Apache
-       cd $(DIR_APP) && CFLAGS="$(CFLAGS)" \
-           EAPI_MM=$(DIR_SRC)/mm-1.4.0 ./configure \
-           --prefix=/home/httpd --exec-prefix=/usr \
-           --sysconfdir=/etc/httpd/conf --logfiledir=/var/log/httpd \
-           --includedir=/usr/include/apache --mandir=/usr/share/man \
-           --localstatedir=/var --runtimedir=/var/run \
-           --disable-rule=SHARED_CHAIN --disable-rule=SHARED_CORE \
-           --disable-rule=EXPAT --disable-rule=WANTHSREGEX \
-           --enable-rule=EAPI --enable-module=rewrite \
-           --disable-module=negotiation --disable-module=status \
-           --disable-module=include --disable-module=autoindex \
-           --disable-module=asis \
-           --disable-module=imap --disable-module=actions \
-           --disable-module=userdir \
-           --enable-module=ssl
-       cd $(DIR_APP) && make
-       cd $(DIR_APP) && make install
-
-       mv -f /usr/bin/httpd /usr/sbin
-       sed 's+CONFIG_ROOT+$(CONFIG_ROOT)+g' $(DIR_SRC)/config/httpd/httpd.conf > /etc/httpd/conf/httpd.conf
-       ln -sf $(CONFIG_ROOT)/main/hostname.conf /etc/httpd/conf/
-
-       # Copy all html/cgi-bin files
-       cp -aR $(DIR_SRC)/html/* /home/httpd
-       -find /home/httpd -name .svn -exec rm -rf {} \;
-       cp $(DIR_DL)/sflogo.png /home/httpd/html/images/
-
-       # Change CONFIG_ROOT in cgi-scripts
-       for i in /home/httpd/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}
-
-
-       # backup directory needs nobody:nobody permissions
-       -mkdir -p /home/httpd/html/backup
-       chown nobody:nobody /home/httpd/html/backup
-
-       @rm -rf $(DIR_APP) $(DIR_SRC)/mm-* $(DIR_SRC)/mod_*
-       @$(POSTBUILD)
index 9581734..0a95ee8 100644 (file)
@@ -86,21 +86,21 @@ ifeq "$(PASS)" "C"
        -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}
+       cp -aR $(DIR_SRC)/html/* /srv/web/ipfire
+       -find /srv/web/ipfire -name .svn -exec rm -rf {} \;
+       cp $(DIR_DL)/sflogo.png /srv/web/ipfire/html/images/
 
        # 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}
 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,15 +116,15 @@ 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
index f1f973d..4ff12d6 100644 (file)
@@ -79,8 +79,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && mkdir -p /opt/applejuice && mv -fv ajcore.jar /opt/applejuice
        cd $(DIR_APP) && mv -fv libajnetmask.so /opt/applejuice
-       mkdir -p /home/httpd/phpaj
-       cd $(DIR_APP) && cp -rfv phpaj /home/httpd/phpaj
+       mkdir -p /srv/web/phpaj
+       cd $(DIR_APP) && cp -rfv phpaj /srv/web/phpaj
        -mkdir /var/ipfire/applejuice
        echo "RAMSIZE=64" > /var/ipfire/applejuice/settings
        chown nobody.nobody /var/ipfire/applejuice -R
index 1fc1541..3c79af9 100644 (file)
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && make site-perl-install
-       -mkdir -p /home/httpd/html/graphs/
+       -mkdir -p /srv/web/ipfire/html/graphs/
        -mkdir -p /var/log/rrd/
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
index 11238df..26b6cb8 100644 (file)
@@ -79,6 +79,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
            -e "s/\$$color{'ims'}  .*$$/\$$color{'ims'}  = ['99','33','99']; # graph ims hit line color/" \
               bin/squid-graph > /usr/bin/squid-graph
        chmod 755 /usr/bin/squid-graph
-       -mkdir -p /home/httpd/html/sgraph
+       -mkdir -p /srv/web/ipfire/html/sgraph
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
index 39aa7c0..def559b 100644 (file)
@@ -82,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make install
 
        # URL-Filter
-       -mkdir /etc/squidGuard /home/httpd/html/repository
+       -mkdir /etc/squidGuard /srv/web/ipfire/html/repository
        cp -f  $(DIR_CONF)/urlfilter/autoupdate.urls /var/ipfire/urlfilter/autoupdate/autoupdate.urls
        ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.daily
        ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.weekly
@@ -98,9 +98,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        /bin/tar --no-same-owner -xzf $(DIR_CONF)/urlfilter/blacklists.tar.gz -C /var/ipfire/urlfilter
        /usr/bin/perl $(DIR_CONF)/urlfilter/makeconf.pl
        chown -R nobody:nobody /var/ipfire/urlfilter
-       chmod 755 /home/httpd/html/images/urlfilter
-       chmod 644 /home/httpd/html/images/urlfilter/*
-       chown -R nobody:nobody /home/httpd/html/repository
+       chmod 755 /srv/web/ipfire/html/images/urlfilter
+       chmod 644 /srv/web/ipfire/html/images/urlfilter/*
+       chown -R nobody:nobody /srv/web/ipfire/html/repository
        chown -R squid:squid /var/log/squidGuard
 
        @rm -rf $(DIR_APP)
index 3e0deeb..02781d8 100644 (file)
@@ -78,7 +78,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       cd $(DIR_SRC) && mkdir -p /home/httpd/webcyradm
-       cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -C /home/httpd/webcyradm
+       cd $(DIR_SRC) && mkdir -p /srv/web/webcyradm
+       cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -C /srv/web/webcyradm
        cd $(DIR_SRC) && tar zxf $(DIR_DL)/mail-db-mysql.tar.gz -C /srv/mysql
        @$(POSTBUILD)
index fb4a8f3..48b5df6 100644 (file)
@@ -669,7 +669,7 @@ stop_tftpd() {
 reload_tftpd() {
        if [ -e $BASEDIR/ipfire-$VERSION-pxe-$MACHINE.tgz ]; then
                mkdir -p $BASEDIR/tftpboot
-               tar xvfz $BASEDIR/ipfire-$VERSION-pxe-$MACHINE.tgz -C $BASEDIR/tftpboot
+               tar xfz $BASEDIR/ipfire-$VERSION-pxe-$MACHINE.tgz -C $BASEDIR/tftpboot
                return 0
        fi
        return 1