Split web-user-interface from apache2 LFS file

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

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 8889b67a746bec93b38439660b2209e09fb19e15..68c99eac57c194cbe47e91e24f6d3becf598a017 100644 (file)
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -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
@@ -12,9 +15,14 @@
 #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
@@ -323,14 +339,14 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/developer/debugging.html.en
 #srv/web/ipfire/manual/developer/documenting.html
 #srv/web/ipfire/manual/developer/documenting.html.en
-#srv/web/ipfire/manual/developer/documenting.html.zh-cn
+#srv/web/ipfire/manual/developer/documenting.html.zh-cn.utf8
 #srv/web/ipfire/manual/developer/filters.html
 #srv/web/ipfire/manual/developer/filters.html.en
 #srv/web/ipfire/manual/developer/hooks.html
 #srv/web/ipfire/manual/developer/hooks.html.en
 #srv/web/ipfire/manual/developer/index.html
 #srv/web/ipfire/manual/developer/index.html.en
-#srv/web/ipfire/manual/developer/index.html.zh-cn
+#srv/web/ipfire/manual/developer/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/developer/modules.html
 #srv/web/ipfire/manual/developer/modules.html.en
 #srv/web/ipfire/manual/developer/modules.html.ja.utf8
@@ -357,7 +373,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/faq/index.html
 #srv/web/ipfire/manual/faq/index.html.en
 #srv/web/ipfire/manual/faq/index.html.tr.utf8
-#srv/web/ipfire/manual/faq/index.html.zh-cn
+#srv/web/ipfire/manual/faq/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/filter.html
 #srv/web/ipfire/manual/filter.html.en
 #srv/web/ipfire/manual/filter.html.es
@@ -381,7 +397,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/handler.html.ko.euc-kr
 #srv/web/ipfire/manual/handler.html.ru.koi8-r
 #srv/web/ipfire/manual/handler.html.tr.utf8
-#srv/web/ipfire/manual/handler.html.zh-cn
+#srv/web/ipfire/manual/handler.html.zh-cn.utf8
 #srv/web/ipfire/manual/howto
 #srv/web/ipfire/manual/howto/access.html
 #srv/web/ipfire/manual/howto/access.html.en
@@ -405,7 +421,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/howto/index.html.en
 #srv/web/ipfire/manual/howto/index.html.ja.utf8
 #srv/web/ipfire/manual/howto/index.html.ko.euc-kr
-#srv/web/ipfire/manual/howto/index.html.zh-cn
+#srv/web/ipfire/manual/howto/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/howto/public_html.html
 #srv/web/ipfire/manual/howto/public_html.html.en
 #srv/web/ipfire/manual/howto/public_html.html.ja.utf8
@@ -434,6 +450,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/images/mod_filter_new.png
 #srv/web/ipfire/manual/images/mod_filter_new.tr.png
 #srv/web/ipfire/manual/images/mod_filter_old.gif
+#srv/web/ipfire/manual/images/mod_filter_old.png
 #srv/web/ipfire/manual/images/mod_rewrite_fig1.gif
 #srv/web/ipfire/manual/images/mod_rewrite_fig1.png
 #srv/web/ipfire/manual/images/mod_rewrite_fig2.gif
@@ -461,7 +478,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/index.html.ko.euc-kr
 #srv/web/ipfire/manual/index.html.pt-br
 #srv/web/ipfire/manual/index.html.tr.utf8
-#srv/web/ipfire/manual/index.html.zh-cn
+#srv/web/ipfire/manual/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/install.html
 #srv/web/ipfire/manual/install.html.de
 #srv/web/ipfire/manual/install.html.en
@@ -492,7 +509,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/misc/index.html.en
 #srv/web/ipfire/manual/misc/index.html.ko.euc-kr
 #srv/web/ipfire/manual/misc/index.html.tr.utf8
-#srv/web/ipfire/manual/misc/index.html.zh-cn
+#srv/web/ipfire/manual/misc/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/misc/password_encryptions.html
 #srv/web/ipfire/manual/misc/password_encryptions.html.en
 #srv/web/ipfire/manual/misc/perf-tuning.html
@@ -534,7 +551,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/directives.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/directives.html.ru.koi8-r
 #srv/web/ipfire/manual/mod/directives.html.tr.utf8
-#srv/web/ipfire/manual/mod/directives.html.zh-cn
+#srv/web/ipfire/manual/mod/directives.html.zh-cn.utf8
 #srv/web/ipfire/manual/mod/event.html
 #srv/web/ipfire/manual/mod/event.html.en
 #srv/web/ipfire/manual/mod/index.html
@@ -544,7 +561,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/index.html.ja.utf8
 #srv/web/ipfire/manual/mod/index.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/index.html.tr.utf8
-#srv/web/ipfire/manual/mod/index.html.zh-cn
+#srv/web/ipfire/manual/mod/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/mod/mod_actions.html
 #srv/web/ipfire/manual/mod/mod_actions.html.de
 #srv/web/ipfire/manual/mod/mod_actions.html.en
@@ -606,6 +623,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/mod_authz_groupfile.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authz_host.html
 #srv/web/ipfire/manual/mod/mod_authz_host.html.en
+#srv/web/ipfire/manual/mod/mod_authz_host.html.fr
 #srv/web/ipfire/manual/mod/mod_authz_host.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authz_host.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authz_owner.html
@@ -851,7 +869,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/quickreference.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/quickreference.html.ru.koi8-r
 #srv/web/ipfire/manual/mod/quickreference.html.tr.utf8
-#srv/web/ipfire/manual/mod/quickreference.html.zh-cn
+#srv/web/ipfire/manual/mod/quickreference.html.zh-cn.utf8
 #srv/web/ipfire/manual/mod/worker.html
 #srv/web/ipfire/manual/mod/worker.html.de
 #srv/web/ipfire/manual/mod/worker.html.en
@@ -865,7 +883,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mpm.html.ja.utf8
 #srv/web/ipfire/manual/mpm.html.ko.euc-kr
 #srv/web/ipfire/manual/mpm.html.tr.utf8
-#srv/web/ipfire/manual/mpm.html.zh-cn
+#srv/web/ipfire/manual/mpm.html.zh-cn.utf8
 #srv/web/ipfire/manual/new_features_2_0.html
 #srv/web/ipfire/manual/new_features_2_0.html.de
 #srv/web/ipfire/manual/new_features_2_0.html.en
@@ -889,7 +907,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/platform/index.html
 #srv/web/ipfire/manual/platform/index.html.en
 #srv/web/ipfire/manual/platform/index.html.ko.euc-kr
-#srv/web/ipfire/manual/platform/index.html.zh-cn
+#srv/web/ipfire/manual/platform/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/platform/netware.html
 #srv/web/ipfire/manual/platform/netware.html.en
 #srv/web/ipfire/manual/platform/netware.html.ko.euc-kr
@@ -952,7 +970,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/programs/index.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/index.html.ru.koi8-r
 #srv/web/ipfire/manual/programs/index.html.tr.utf8
-#srv/web/ipfire/manual/programs/index.html.zh-cn
+#srv/web/ipfire/manual/programs/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/programs/logresolve.html
 #srv/web/ipfire/manual/programs/logresolve.html.en
 #srv/web/ipfire/manual/programs/logresolve.html.ko.euc-kr
@@ -985,7 +1003,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/rewrite/index.html.en
 #srv/web/ipfire/manual/rewrite/index.html.fr
 #srv/web/ipfire/manual/rewrite/index.html.tr.utf8
-#srv/web/ipfire/manual/rewrite/index.html.zh-cn
+#srv/web/ipfire/manual/rewrite/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/rewrite/intro.html
 #srv/web/ipfire/manual/rewrite/intro.html.en
 #srv/web/ipfire/manual/rewrite/intro.html.fr
@@ -1018,13 +1036,13 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/sitemap.html.ja.utf8
 #srv/web/ipfire/manual/sitemap.html.ko.euc-kr
 #srv/web/ipfire/manual/sitemap.html.tr.utf8
-#srv/web/ipfire/manual/sitemap.html.zh-cn
+#srv/web/ipfire/manual/sitemap.html.zh-cn.utf8
 #srv/web/ipfire/manual/ssl
 #srv/web/ipfire/manual/ssl/index.html
 #srv/web/ipfire/manual/ssl/index.html.en
 #srv/web/ipfire/manual/ssl/index.html.ja.utf8
 #srv/web/ipfire/manual/ssl/index.html.tr.utf8
-#srv/web/ipfire/manual/ssl/index.html.zh-cn
+#srv/web/ipfire/manual/ssl/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/ssl/ssl_compat.html
 #srv/web/ipfire/manual/ssl/ssl_compat.html.en
 #srv/web/ipfire/manual/ssl/ssl_faq.html
@@ -1061,7 +1079,9 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/style/manualpage.dtd
 #srv/web/ipfire/manual/style/modulesynopsis.dtd
 #srv/web/ipfire/manual/style/scripts
+#srv/web/ipfire/manual/style/scripts/MINIFY
 #srv/web/ipfire/manual/style/scripts/prettify.js
+#srv/web/ipfire/manual/style/scripts/prettify.min.js
 #srv/web/ipfire/manual/style/sitemap.dtd
 #srv/web/ipfire/manual/style/version.ent
 #srv/web/ipfire/manual/style/xsl
@@ -1108,7 +1128,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/vhosts/index.html.ko.euc-kr
 #srv/web/ipfire/manual/vhosts/index.html.ru.koi8-r
 #srv/web/ipfire/manual/vhosts/index.html.tr.utf8
-#srv/web/ipfire/manual/vhosts/index.html.zh-cn
+#srv/web/ipfire/manual/vhosts/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/vhosts/ip-based.html
 #srv/web/ipfire/manual/vhosts/ip-based.html.en
 #srv/web/ipfire/manual/vhosts/ip-based.html.fr
@@ -1153,6 +1173,7 @@ etc/httpd/conf/mime.types
 #usr/include/apache/apr_dso.h
 #usr/include/apache/apr_env.h
 #usr/include/apache/apr_errno.h
+#usr/include/apache/apr_escape.h
 #usr/include/apache/apr_file_info.h
 #usr/include/apache/apr_file_io.h
 #usr/include/apache/apr_fnmatch.h
@@ -1188,6 +1209,7 @@ etc/httpd/conf/mime.types
 #usr/include/apache/apr_sha1.h
 #usr/include/apache/apr_shm.h
 #usr/include/apache/apr_signal.h
+#usr/include/apache/apr_skiplist.h
 #usr/include/apache/apr_strings.h
 #usr/include/apache/apr_strmatch.h
 #usr/include/apache/apr_support.h
@@ -1330,12 +1352,12 @@ usr/lib/apr-util-1/apr_dbd_sqlite3.so
 #usr/lib/libapr-1.la
 usr/lib/libapr-1.so
 usr/lib/libapr-1.so.0
-usr/lib/libapr-1.so.0.4.6
+usr/lib/libapr-1.so.0.5.1
 #usr/lib/libaprutil-1.a
 #usr/lib/libaprutil-1.la
 usr/lib/libaprutil-1.so
 usr/lib/libaprutil-1.so.0
-usr/lib/libaprutil-1.so.0.4.1
+usr/lib/libaprutil-1.so.0.5.3
 #usr/lib/pkgconfig/apr-1.pc
 #usr/lib/pkgconfig/apr-util-1.pc
 #usr/sbin/ab
@@ -1367,73 +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/ddns.cgi
-srv/web/ipfire/cgi-bin/dhcp.cgi
-#srv/web/ipfire/cgi-bin/dmzholes.cgi
-srv/web/ipfire/cgi-bin/extrahd.cgi
-srv/web/ipfire/cgi-bin/fireinfo.cgi
-srv/web/ipfire/cgi-bin/forwardfw.cgi
-srv/web/ipfire/cgi-bin/fwhosts.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/netexternal.cgi
-srv/web/ipfire/cgi-bin/netinternal.cgi
-srv/web/ipfire/cgi-bin/netother.cgi
-#srv/web/ipfire/cgi-bin/outgoingfw.cgi
-#srv/web/ipfire/cgi-bin/outgoinggrp.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/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/cgi-bin/xtaccess.cgi
-srv/web/ipfire/html
-var/updatecache