Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

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

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 3dd2acbe3960afecb4d96e32f161ec3abf3d0a6e..d0c41ef3306938b175456499a7d849f03a67aba3 100644 (file)
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -321,6 +321,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/custom-error.html.es
 #srv/web/ipfire/manual/custom-error.html.ja.utf8
 #srv/web/ipfire/manual/custom-error.html.ko.euc-kr
+#srv/web/ipfire/manual/custom-error.html.tr.utf8
 #srv/web/ipfire/manual/developer
 #srv/web/ipfire/manual/developer/API.html
 #srv/web/ipfire/manual/developer/API.html.en
@@ -345,6 +346,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/dns-caveats.html.en
 #srv/web/ipfire/manual/dns-caveats.html.ja.utf8
 #srv/web/ipfire/manual/dns-caveats.html.ko.euc-kr
+#srv/web/ipfire/manual/dns-caveats.html.tr.utf8
 #srv/web/ipfire/manual/dso.html
 #srv/web/ipfire/manual/dso.html.en
 #srv/web/ipfire/manual/dso.html.ja.utf8
@@ -480,6 +482,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/misc/index.html
 #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/password_encryptions.html
 #srv/web/ipfire/manual/misc/password_encryptions.html.en
 #srv/web/ipfire/manual/misc/perf-tuning.html
@@ -767,6 +770,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/mod_suexec.html.en
 #srv/web/ipfire/manual/mod/mod_suexec.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_suexec.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_suexec.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_unique_id.html
 #srv/web/ipfire/manual/mod/mod_unique_id.html.en
 #srv/web/ipfire/manual/mod/mod_unique_id.html.ja.utf8
@@ -775,6 +779,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/mod_userdir.html.en
 #srv/web/ipfire/manual/mod/mod_userdir.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_userdir.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_userdir.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_usertrack.html
 #srv/web/ipfire/manual/mod/mod_usertrack.html.en
 #srv/web/ipfire/manual/mod/mod_version.html
@@ -806,6 +811,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/prefork.html.de
 #srv/web/ipfire/manual/mod/prefork.html.en
 #srv/web/ipfire/manual/mod/prefork.html.ja.utf8
+#srv/web/ipfire/manual/mod/prefork.html.tr.utf8
 #srv/web/ipfire/manual/mod/quickreference.html
 #srv/web/ipfire/manual/mod/quickreference.html.de
 #srv/web/ipfire/manual/mod/quickreference.html.en
@@ -818,6 +824,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/worker.html.de
 #srv/web/ipfire/manual/mod/worker.html.en
 #srv/web/ipfire/manual/mod/worker.html.ja.utf8
+#srv/web/ipfire/manual/mod/worker.html.tr.utf8
 #srv/web/ipfire/manual/mpm.html
 #srv/web/ipfire/manual/mpm.html.de
 #srv/web/ipfire/manual/mpm.html.en
@@ -864,9 +871,11 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/programs/ab.html
 #srv/web/ipfire/manual/programs/ab.html.en
 #srv/web/ipfire/manual/programs/ab.html.ko.euc-kr
+#srv/web/ipfire/manual/programs/ab.html.tr.utf8
 #srv/web/ipfire/manual/programs/apachectl.html
 #srv/web/ipfire/manual/programs/apachectl.html.en
 #srv/web/ipfire/manual/programs/apachectl.html.ko.euc-kr
+#srv/web/ipfire/manual/programs/apachectl.html.tr.utf8
 #srv/web/ipfire/manual/programs/apxs.html
 #srv/web/ipfire/manual/programs/apxs.html.en
 #srv/web/ipfire/manual/programs/apxs.html.ko.euc-kr
@@ -991,6 +1000,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/suexec.html.en
 #srv/web/ipfire/manual/suexec.html.ja.utf8
 #srv/web/ipfire/manual/suexec.html.ko.euc-kr
+#srv/web/ipfire/manual/suexec.html.tr.utf8
 #srv/web/ipfire/manual/upgrading.html
 #srv/web/ipfire/manual/upgrading.html.de
 #srv/web/ipfire/manual/upgrading.html.en
@@ -1141,6 +1151,7 @@ etc/httpd/conf/mime.types
 #usr/include/apache/mod_include.h
 #usr/include/apache/mod_log_config.h
 #usr/include/apache/mod_proxy.h
+#usr/include/apache/mod_rewrite.h
 #usr/include/apache/mod_ssl.h
 #usr/include/apache/mod_status.h
 #usr/include/apache/mpm.h
@@ -1214,6 +1225,12 @@ usr/lib/apache/mod_logio.so
 usr/lib/apache/mod_mime.so
 usr/lib/apache/mod_mime_magic.so
 usr/lib/apache/mod_negotiation.so
+usr/lib/apache/mod_proxy.so
+usr/lib/apache/mod_proxy_ajp.so
+usr/lib/apache/mod_proxy_balancer.so
+usr/lib/apache/mod_proxy_connect.so
+usr/lib/apache/mod_proxy_ftp.so
+usr/lib/apache/mod_proxy_http.so
 usr/lib/apache/mod_rewrite.so
 usr/lib/apache/mod_setenvif.so
 usr/lib/apache/mod_speling.so
@@ -1281,6 +1298,8 @@ 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
+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
@@ -1322,8 +1341,8 @@ 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/networks.cgi
 srv/web/ipfire/cgi-bin/outgoingfw.cgi
+srv/web/ipfire/cgi-bin/optionsfw.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/pakfire.cgi
 srv/web/ipfire/cgi-bin/portfw.cgi