Merge remote-tracking branch 'stevee/next' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 May 2015 18:20:29 +0000 (20:20 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 May 2015 18:20:29 +0000 (20:20 +0200)
config/httpd/httpd.conf
config/rootfiles/common/apache2
lfs/apache2
lfs/web-user-interface [new file with mode: 0644]
make.sh

index 7e00b88..9c1fb2b 100644 (file)
@@ -117,4 +117,5 @@ Include /etc/httpd/conf/default-server.conf
 #
 Include /etc/httpd/conf/vhosts.d/*.conf
 
-
+# Dummy LoadModule directive to aid module installations
+#LoadModule dummy_module /usr/lib/apache2/modules/mod_dummy.so
index 96c2871..68c99ea 100644 (file)
@@ -1,5 +1,8 @@
 #etc/httpd
 #etc/httpd/conf
+#etc/httpd/conf/conf.d
+#etc/httpd/conf/conf.d/php5.conf
+#etc/httpd/conf/default-server.conf
 #etc/httpd/conf/extra
 #etc/httpd/conf/extra/httpd-autoindex.conf
 #etc/httpd/conf/extra/httpd-dav.conf
 #etc/httpd/conf/extra/httpd-ssl.conf
 #etc/httpd/conf/extra/httpd-userdir.conf
 #etc/httpd/conf/extra/httpd-vhosts.conf
+etc/httpd/conf/global.conf
+etc/httpd/conf/hostname.conf
 etc/httpd/conf/httpd.conf
+etc/httpd/conf/listen.conf
+etc/httpd/conf/loadmodule.conf
 etc/httpd/conf/magic
 etc/httpd/conf/mime.types
+etc/httpd/conf/mod_log_config.conf
 #etc/httpd/conf/original
 #etc/httpd/conf/original/extra
 #etc/httpd/conf/original/extra/httpd-autoindex.conf
@@ -29,6 +37,14 @@ etc/httpd/conf/mime.types
 #etc/httpd/conf/original/extra/httpd-userdir.conf
 #etc/httpd/conf/original/extra/httpd-vhosts.conf
 #etc/httpd/conf/original/httpd.conf
+etc/httpd/conf/server-tuning.conf
+etc/httpd/conf/ssl-global.conf
+etc/httpd/conf/uid.conf
+#etc/httpd/conf/vhosts.d
+etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
+etc/httpd/conf/vhosts.d/ipfire-interface.conf
+#etc/httpd/conf/vhosts.d/nagios.conf
+#etc/httpd/conf/vhosts.d/openmailadmin.conf
 #srv/web
 #srv/web/ipfire
 #srv/web/ipfire/cgi-bin
@@ -1373,257 +1389,3 @@ usr/sbin/httpd
 #usr/share/man/man8/rotatelogs.8
 #usr/share/man/man8/suexec.8
 var/log/httpd
-etc/httpd/conf/conf.d
-etc/httpd/conf/default-server.conf
-etc/httpd/conf/global.conf
-etc/httpd/conf/hostname.conf
-etc/httpd/conf/listen.conf
-etc/httpd/conf/loadmodule.conf
-etc/httpd/conf/mod_log_config.conf
-etc/httpd/conf/server-tuning.conf
-etc/httpd/conf/ssl-global.conf
-etc/httpd/conf/uid.conf
-etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
-etc/httpd/conf/vhosts.d/ipfire-interface.conf
-srv/web/ipfire/cgi-bin/aliases.cgi
-srv/web/ipfire/cgi-bin/atm-status.cgi
-srv/web/ipfire/cgi-bin/backup.cgi
-srv/web/ipfire/cgi-bin/chpasswd.cgi
-srv/web/ipfire/cgi-bin/connections.cgi
-srv/web/ipfire/cgi-bin/connscheduler.cgi
-srv/web/ipfire/cgi-bin/country.cgi
-srv/web/ipfire/cgi-bin/credits.cgi
-srv/web/ipfire/cgi-bin/dns.cgi
-srv/web/ipfire/cgi-bin/dnsforward.cgi
-srv/web/ipfire/cgi-bin/ddns.cgi
-srv/web/ipfire/cgi-bin/dhcp.cgi
-srv/web/ipfire/cgi-bin/entropy.cgi
-srv/web/ipfire/cgi-bin/extrahd.cgi
-srv/web/ipfire/cgi-bin/fireinfo.cgi
-srv/web/ipfire/cgi-bin/firewall.cgi
-srv/web/ipfire/cgi-bin/fwhosts.cgi
-srv/web/ipfire/cgi-bin/geoip-block.cgi
-srv/web/ipfire/cgi-bin/gpl.cgi
-srv/web/ipfire/cgi-bin/gui.cgi
-srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
-srv/web/ipfire/cgi-bin/hosts.cgi
-srv/web/ipfire/cgi-bin/ids.cgi
-srv/web/ipfire/cgi-bin/index.cgi
-srv/web/ipfire/cgi-bin/ipinfo.cgi
-srv/web/ipfire/cgi-bin/iptables.cgi
-srv/web/ipfire/cgi-bin/logs.cgi
-srv/web/ipfire/cgi-bin/mac.cgi
-srv/web/ipfire/cgi-bin/media.cgi
-srv/web/ipfire/cgi-bin/memory.cgi
-srv/web/ipfire/cgi-bin/modem.cgi
-srv/web/ipfire/cgi-bin/modem-status.cgi
-srv/web/ipfire/cgi-bin/netexternal.cgi
-srv/web/ipfire/cgi-bin/netinternal.cgi
-srv/web/ipfire/cgi-bin/netother.cgi
-srv/web/ipfire/cgi-bin/netovpnrw.cgi
-srv/web/ipfire/cgi-bin/netovpnsrv.cgi
-srv/web/ipfire/cgi-bin/optionsfw.cgi
-srv/web/ipfire/cgi-bin/ovpnmain.cgi
-srv/web/ipfire/cgi-bin/p2p-block.cgi
-srv/web/ipfire/cgi-bin/pakfire.cgi
-srv/web/ipfire/cgi-bin/pppsetup.cgi
-srv/web/ipfire/cgi-bin/proxy.cgi
-srv/web/ipfire/cgi-bin/qos.cgi
-srv/web/ipfire/cgi-bin/remote.cgi
-srv/web/ipfire/cgi-bin/routing.cgi
-srv/web/ipfire/cgi-bin/services.cgi
-srv/web/ipfire/cgi-bin/shutdown.cgi
-srv/web/ipfire/cgi-bin/speed.cgi
-srv/web/ipfire/cgi-bin/system.cgi
-srv/web/ipfire/cgi-bin/time.cgi
-srv/web/ipfire/cgi-bin/traffic.cgi
-srv/web/ipfire/cgi-bin/updatexlrator.cgi
-srv/web/ipfire/cgi-bin/upnp.cgi
-srv/web/ipfire/cgi-bin/urlfilter.cgi
-srv/web/ipfire/cgi-bin/vpnmain.cgi
-srv/web/ipfire/cgi-bin/wakeonlan.cgi
-srv/web/ipfire/cgi-bin/webaccess.cgi
-srv/web/ipfire/cgi-bin/wireless.cgi
-srv/web/ipfire/cgi-bin/wirelessclient.cgi
-#srv/web/ipfire/html
-srv/web/ipfire/html/accounting
-srv/web/ipfire/html/blob.gif
-srv/web/ipfire/html/clwarn.cgi
-srv/web/ipfire/html/dial.cgi
-srv/web/ipfire/html/favicon.ico
-srv/web/ipfire/html/graphs
-#srv/web/ipfire/html/images
-srv/web/ipfire/html/images/addblue.gif
-srv/web/ipfire/html/images/add.gif
-srv/web/ipfire/html/images/addgreen.gif
-srv/web/ipfire/html/images/address-book-new.png
-srv/web/ipfire/html/images/application-certificate.png
-srv/web/ipfire/html/images/applications-accessories.png
-srv/web/ipfire/html/images/applications-development.png
-srv/web/ipfire/html/images/applications-games.png
-srv/web/ipfire/html/images/applications-graphics.png
-srv/web/ipfire/html/images/applications-internet.png
-srv/web/ipfire/html/images/applications-multimedia.png
-srv/web/ipfire/html/images/applications-office.png
-srv/web/ipfire/html/images/applications-other.png
-srv/web/ipfire/html/images/applications-system.png
-srv/web/ipfire/html/images/application-x-executable.png
-srv/web/ipfire/html/images/appointment-new.png
-srv/web/ipfire/html/images/audio-volume-high.png
-srv/web/ipfire/html/images/audio-volume-high-red.png
-srv/web/ipfire/html/images/audio-volume-low.png
-srv/web/ipfire/html/images/audio-volume-low-red.png
-srv/web/ipfire/html/images/audio-x-generic.png
-srv/web/ipfire/html/images/audio-x-generic-red.png
-srv/web/ipfire/html/images/background.gif
-srv/web/ipfire/html/images/bookmark-new.png
-srv/web/ipfire/html/images/clock.gif
-srv/web/ipfire/html/images/computer.png
-srv/web/ipfire/html/images/delete.gif
-srv/web/ipfire/html/images/dialog-error.png
-srv/web/ipfire/html/images/dialog-information.png
-srv/web/ipfire/html/images/dialog-warning.png
-srv/web/ipfire/html/images/dns_link.png
-srv/web/ipfire/html/images/document-new.png
-srv/web/ipfire/html/images/document-open.png
-srv/web/ipfire/html/images/document-print.png
-srv/web/ipfire/html/images/document-print-preview.png
-srv/web/ipfire/html/images/document-properties.png
-srv/web/ipfire/html/images/document-save-as.png
-srv/web/ipfire/html/images/document-save.png
-srv/web/ipfire/html/images/down.gif
-srv/web/ipfire/html/images/drive-harddisk.png
-srv/web/ipfire/html/images/drive-optical.png
-srv/web/ipfire/html/images/drive-removable-media.png
-srv/web/ipfire/html/images/edit-find.png
-srv/web/ipfire/html/images/edit.gif
-srv/web/ipfire/html/images/edit-redo.png
-#srv/web/ipfire/html/images/flags
-srv/web/ipfire/html/images/floppy.gif
-srv/web/ipfire/html/images/folder-drag-accept.png
-srv/web/ipfire/html/images/folder-new.png
-srv/web/ipfire/html/images/folder-open.png
-srv/web/ipfire/html/images/folder.png
-srv/web/ipfire/html/images/folder-remote.png
-srv/web/ipfire/html/images/folder-saved-search.png
-srv/web/ipfire/html/images/folder-visiting.png
-srv/web/ipfire/html/images/format-indent-less.png
-srv/web/ipfire/html/images/format-indent-more.png
-srv/web/ipfire/html/images/format-justify-center.png
-srv/web/ipfire/html/images/format-justify-fill.png
-srv/web/ipfire/html/images/format-justify-left.png
-srv/web/ipfire/html/images/format-justify-right.png
-srv/web/ipfire/html/images/forward.gif
-srv/web/ipfire/html/images/go-bottom.png
-srv/web/ipfire/html/images/go-down.png
-srv/web/ipfire/html/images/go-first.png
-srv/web/ipfire/html/images/go-home.png
-srv/web/ipfire/html/images/go-jump.png
-srv/web/ipfire/html/images/go-last.png
-srv/web/ipfire/html/images/go-next.png
-srv/web/ipfire/html/images/go-previous.png
-srv/web/ipfire/html/images/go-top.png
-srv/web/ipfire/html/images/go-up.png
-srv/web/ipfire/html/images/help-browser.png
-srv/web/ipfire/html/images/help.gif
-srv/web/ipfire/html/images/image-loading.png
-srv/web/ipfire/html/images/image-missing.png
-srv/web/ipfire/html/images/image-x-generic.png
-srv/web/ipfire/html/images/indicator.gif
-srv/web/ipfire/html/images/info.gif
-srv/web/ipfire/html/images/input-gaming.png
-srv/web/ipfire/html/images/input-keyboard.png
-srv/web/ipfire/html/images/input-mouse.png
-srv/web/ipfire/html/images/internet-group-chat.png
-srv/web/ipfire/html/images/internet-mail.png
-srv/web/ipfire/html/images/internet-news-reader.png
-srv/web/ipfire/html/images/internet-web-browser.png
-srv/web/ipfire/html/images/IPFire.png
-srv/web/ipfire/html/images/list-add.png
-srv/web/ipfire/html/images/list-remove.png
-srv/web/ipfire/html/images/mail-attachment.png
-srv/web/ipfire/html/images/mail-forward.png
-srv/web/ipfire/html/images/mail-mark-junk.png
-srv/web/ipfire/html/images/mail-mark-not-junk.png
-srv/web/ipfire/html/images/mail-message-new.png
-srv/web/ipfire/html/images/mail-reply-all.png
-srv/web/ipfire/html/images/mail-reply-sender.png
-srv/web/ipfire/html/images/mail-send-receive.png
-srv/web/ipfire/html/images/media-flash.png
-srv/web/ipfire/html/images/media-floppy.png
-srv/web/ipfire/html/images/media-optical.png
-srv/web/ipfire/html/images/media-playback-start-all.png
-srv/web/ipfire/html/images/media-playback-start.png
-srv/web/ipfire/html/images/media-playback-stop.png
-srv/web/ipfire/html/images/media-repeat.png
-srv/web/ipfire/html/images/media-resume.png
-srv/web/ipfire/html/images/media-shuffle.png
-srv/web/ipfire/html/images/media-skip-backward.png
-srv/web/ipfire/html/images/media-skip-forward.png
-srv/web/ipfire/html/images/mpfire
-srv/web/ipfire/html/images/network-error.png
-srv/web/ipfire/html/images/network-idle.png
-srv/web/ipfire/html/images/network-offline.png
-srv/web/ipfire/html/images/network.png
-srv/web/ipfire/html/images/network-receive.png
-srv/web/ipfire/html/images/network-server.png
-srv/web/ipfire/html/images/network-transmit.png
-srv/web/ipfire/html/images/network-transmit-receive.png
-srv/web/ipfire/html/images/network-wired.png
-srv/web/ipfire/html/images/network-wireless-encrypted.png
-srv/web/ipfire/html/images/network-wireless.png
-srv/web/ipfire/html/images/network-workgroup.png
-srv/web/ipfire/html/images/null.gif
-srv/web/ipfire/html/images/off.gif
-srv/web/ipfire/html/images/on.gif
-srv/web/ipfire/html/images/openvpn.gif
-srv/web/ipfire/html/images/openvpn.png
-srv/web/ipfire/html/images/package-x-generic.png
-srv/web/ipfire/html/images/printer-error.png
-srv/web/ipfire/html/images/printer.png
-srv/web/ipfire/html/images/process-stop.png
-srv/web/ipfire/html/images/process-working.png
-srv/web/ipfire/html/images/reload.gif
-srv/web/ipfire/html/images/start-here.png
-srv/web/ipfire/html/images/stock_down-16.png
-srv/web/ipfire/html/images/stock_ok.png
-srv/web/ipfire/html/images/stock_stop.png
-srv/web/ipfire/html/images/stock_up-16.png
-srv/web/ipfire/html/images/system-file-manager.png
-srv/web/ipfire/html/images/system-installer.png
-srv/web/ipfire/html/images/system-lock-screen.png
-srv/web/ipfire/html/images/system-log-out.png
-srv/web/ipfire/html/images/system-search.png
-srv/web/ipfire/html/images/system-shutdown.png
-srv/web/ipfire/html/images/system-software-update.png
-srv/web/ipfire/html/images/system-users.png
-srv/web/ipfire/html/images/table-header.gif
-srv/web/ipfire/html/images/tab-new.png
-srv/web/ipfire/html/images/text-html.png
-srv/web/ipfire/html/images/text-x-generic.png
-srv/web/ipfire/html/images/text-x-generic-template.png
-srv/web/ipfire/html/images/text-x-script.png
-srv/web/ipfire/html/images/tux.png
-srv/web/ipfire/html/images/updbooster
-srv/web/ipfire/html/images/up.gif
-srv/web/ipfire/html/images/urlfilter
-srv/web/ipfire/html/images/user-home.png
-srv/web/ipfire/html/images/user-multiple.png
-srv/web/ipfire/html/images/user-option-add.png
-srv/web/ipfire/html/images/user-option-remove.png
-srv/web/ipfire/html/images/user-trash-full.png
-srv/web/ipfire/html/images/user-trash.png
-srv/web/ipfire/html/images/utilities-system-monitor.png
-srv/web/ipfire/html/images/utilities-terminal.png
-srv/web/ipfire/html/images/view-fullscreen.png
-srv/web/ipfire/html/images/view-refresh.png
-srv/web/ipfire/html/images/wakeup.gif
-srv/web/ipfire/html/images/window-new.png
-srv/web/ipfire/html/include
-srv/web/ipfire/html/index.cgi
-srv/web/ipfire/html/proxy.pac
-srv/web/ipfire/html/redirect.cgi
-srv/web/ipfire/html/redirect-templates
-srv/web/ipfire/html/themes
-srv/web/ipfire/html/wpad.dat
-var/updatecache
index 0d7b11e..57c3447 100644 (file)
@@ -31,11 +31,8 @@ THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(PASS)" "C"
-       TARGET     = $(DIR_INFO)/$(THISAPP)-config
-else
-       TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
+
+TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -77,32 +74,6 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-ifeq "$(PASS)" "C"
-       # DO THIS IN AN EXTRA STEP BECAUSE PHP AND SUBVERSION WILL FAIL.
-
-       cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf
-       ln -sf $(CONFIG_ROOT)/main/hostname.conf /etc/httpd/conf/
-
-       # Copy all html/cgi-bin files
-       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 /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 /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
 
@@ -140,6 +111,10 @@ else
            /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
+
+       # Install apache config
+       cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf
+       ln -sf $(CONFIG_ROOT)/main/hostname.conf /etc/httpd/conf/
+
        @rm -rf $(DIR_APP)
-endif
        @$(POSTBUILD)
diff --git a/lfs/web-user-interface b/lfs/web-user-interface
new file mode 100644 (file)
index 0000000..919acbe
--- /dev/null
@@ -0,0 +1,72 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2015   IPFire Team  <info@ipfire.org>                    #
+#                                                                             #
+# 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 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = ipfire
+
+THISAPP    = web-user-interface-$(VER)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+install: $(TARGET)
+
+check: 
+
+download:
+
+md5: 
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+
+       # Copy all html/cgi-bin files
+       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 /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 /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
+       @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 95aae64..1d28746 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -507,7 +507,7 @@ buildipfire() {
   ipfiremake openldap
   ipfiremake apache2
   ipfiremake php
-  ipfiremake apache2                   PASS=C
+  ipfiremake web-user-interface
   ipfiremake flag-icons
   ipfiremake jquery
   ipfiremake arping