Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / config / rootfiles / common / apache2

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 1a62a4e14578f8e5806c853a429ca4e9821aaa44..d10c4f138c6c70ddfbe759b5364f92ab1652e37b 100644 (file)
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -1,7 +1,5 @@
 #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
@@ -43,11 +41,9 @@ 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/captive.conf
 etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
 etc/httpd/conf/vhosts.d/ipfire-interface.conf
-etc/httpd/conf/vhosts.d/captive.conf
-#etc/httpd/conf/vhosts.d/nagios.conf
-#etc/httpd/conf/vhosts.d/openmailadmin.conf
 #srv/web
 #srv/web/ipfire
 #srv/web/ipfire/manual/howto/access.html.es
@@ -92,6 +88,8 @@ etc/httpd/conf/vhosts.d/captive.conf
 #srv/web/ipfire/error/include/top.html
 #srv/web/ipfire/htdocs
 #srv/web/ipfire/htdocs/index.html
+#srv/web/ipfire/html
+srv/web/ipfire/html/captive
 #srv/web/ipfire/icons
 #srv/web/ipfire/icons/README
 #srv/web/ipfire/icons/README.html
@@ -912,6 +910,8 @@ etc/httpd/conf/vhosts.d/captive.conf
 #srv/web/ipfire/manual/mod/mod_macro.html
 #srv/web/ipfire/manual/mod/mod_macro.html.en
 #srv/web/ipfire/manual/mod/mod_macro.html.fr
+#srv/web/ipfire/manual/mod/mod_md.html
+#srv/web/ipfire/manual/mod/mod_md.html.en
 #srv/web/ipfire/manual/mod/mod_mime.html
 #srv/web/ipfire/manual/mod/mod_mime.html.en
 #srv/web/ipfire/manual/mod/mod_mime.html.fr
@@ -970,6 +970,8 @@ etc/httpd/conf/vhosts.d/captive.conf
 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html
 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.en
 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html
+#srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html.en
 #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html
 #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html.en
 #srv/web/ipfire/manual/mod/mod_ratelimit.html
@@ -1113,6 +1115,8 @@ etc/httpd/conf/vhosts.d/captive.conf
 #srv/web/ipfire/manual/mod/mpmt_os2.html
 #srv/web/ipfire/manual/mod/mpmt_os2.html.en
 #srv/web/ipfire/manual/mod/mpmt_os2.html.fr
+#srv/web/ipfire/manual/mod/overrides.html
+#srv/web/ipfire/manual/mod/overrides.html.en
 #srv/web/ipfire/manual/mod/prefork.html
 #srv/web/ipfire/manual/mod/prefork.html.de
 #srv/web/ipfire/manual/mod/prefork.html.en
@@ -1525,7 +1529,7 @@ usr/bin/htpasswd
 #usr/include/apache/util_time.h
 #usr/include/apache/util_varbuf.h
 #usr/include/apache/util_xml.h
-usr/lib/apache
+#usr/lib/apache
 #usr/lib/apache/build
 #usr/lib/apache/build/config.nice
 #usr/lib/apache/build/config_vars.mk
@@ -1609,6 +1613,7 @@ usr/lib/apache/mod_proxy_hcheck.so
 usr/lib/apache/mod_proxy_html.so
 usr/lib/apache/mod_proxy_http.so
 usr/lib/apache/mod_proxy_scgi.so
+usr/lib/apache/mod_proxy_uwsgi.so
 usr/lib/apache/mod_proxy_wstunnel.so
 usr/lib/apache/mod_ratelimit.so
 usr/lib/apache/mod_reflector.so
@@ -1663,3 +1668,4 @@ usr/sbin/httpd
 #usr/share/man/man8/rotatelogs.8
 #usr/share/man/man8/suexec.8
 var/log/httpd
+var/log/httpd/captive