Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

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

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 64faa7926c5ddd1ff7ebe543457e84f387391de1..e1b1ca8253ba9935503749f27feda69e6af19cc6 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
@@ -46,21 +44,8 @@ etc/httpd/conf/uid.conf
 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/nagios.conf
-#etc/httpd/conf/vhosts.d/openmailadmin.conf
 #srv/web
 #srv/web/ipfire
-#srv/web/ipfire/manual/howto/access.html.es
-#srv/web/ipfire/manual/howto/auth.html.es
-#srv/web/ipfire/manual/howto/cgi.html.es
-#srv/web/ipfire/manual/howto/htaccess.html.es
-#srv/web/ipfire/manual/howto/http2.html.es
-#srv/web/ipfire/manual/howto/http2.html.fr
-#srv/web/ipfire/manual/howto/index.html.es
-#srv/web/ipfire/manual/howto/public_html.html.es
-#srv/web/ipfire/manual/mod/directive-dict.html.es
-#srv/web/ipfire/manual/mod/mod_brotli.html
-#srv/web/ipfire/manual/mod/mod_brotli.html.en
 #srv/web/ipfire/cgi-bin
 #srv/web/ipfire/cgi-bin/printenv
 #srv/web/ipfire/cgi-bin/printenv.vbs
@@ -456,42 +441,52 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/howto
 #srv/web/ipfire/manual/howto/access.html
 #srv/web/ipfire/manual/howto/access.html.en
+#srv/web/ipfire/manual/howto/access.html.es
 #srv/web/ipfire/manual/howto/access.html.fr
 #srv/web/ipfire/manual/howto/auth.html
 #srv/web/ipfire/manual/howto/auth.html.en
+#srv/web/ipfire/manual/howto/auth.html.es
 #srv/web/ipfire/manual/howto/auth.html.fr
 #srv/web/ipfire/manual/howto/auth.html.ja.utf8
 #srv/web/ipfire/manual/howto/auth.html.ko.euc-kr
 #srv/web/ipfire/manual/howto/auth.html.tr.utf8
 #srv/web/ipfire/manual/howto/cgi.html
 #srv/web/ipfire/manual/howto/cgi.html.en
+#srv/web/ipfire/manual/howto/cgi.html.es
 #srv/web/ipfire/manual/howto/cgi.html.fr
 #srv/web/ipfire/manual/howto/cgi.html.ja.utf8
 #srv/web/ipfire/manual/howto/cgi.html.ko.euc-kr
 #srv/web/ipfire/manual/howto/htaccess.html
 #srv/web/ipfire/manual/howto/htaccess.html.en
+#srv/web/ipfire/manual/howto/htaccess.html.es
 #srv/web/ipfire/manual/howto/htaccess.html.fr
 #srv/web/ipfire/manual/howto/htaccess.html.ja.utf8
 #srv/web/ipfire/manual/howto/htaccess.html.ko.euc-kr
 #srv/web/ipfire/manual/howto/htaccess.html.pt-br
 #srv/web/ipfire/manual/howto/http2.html
 #srv/web/ipfire/manual/howto/http2.html.en
+#srv/web/ipfire/manual/howto/http2.html.es
+#srv/web/ipfire/manual/howto/http2.html.fr
 #srv/web/ipfire/manual/howto/index.html
 #srv/web/ipfire/manual/howto/index.html.en
+#srv/web/ipfire/manual/howto/index.html.es
 #srv/web/ipfire/manual/howto/index.html.fr
 #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.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.es
 #srv/web/ipfire/manual/howto/public_html.html.fr
 #srv/web/ipfire/manual/howto/public_html.html.ja.utf8
 #srv/web/ipfire/manual/howto/public_html.html.ko.euc-kr
 #srv/web/ipfire/manual/howto/public_html.html.tr.utf8
 #srv/web/ipfire/manual/howto/reverse_proxy.html
 #srv/web/ipfire/manual/howto/reverse_proxy.html.en
+#srv/web/ipfire/manual/howto/reverse_proxy.html.fr
 #srv/web/ipfire/manual/howto/ssi.html
 #srv/web/ipfire/manual/howto/ssi.html.en
+#srv/web/ipfire/manual/howto/ssi.html.es
 #srv/web/ipfire/manual/howto/ssi.html.fr
 #srv/web/ipfire/manual/howto/ssi.html.ja.utf8
 #srv/web/ipfire/manual/howto/ssi.html.ko.euc-kr
@@ -579,6 +574,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/misc
 #srv/web/ipfire/manual/misc/index.html
 #srv/web/ipfire/manual/misc/index.html.en
+#srv/web/ipfire/manual/misc/index.html.es
 #srv/web/ipfire/manual/misc/index.html.fr
 #srv/web/ipfire/manual/misc/index.html.ko.euc-kr
 #srv/web/ipfire/manual/misc/index.html.tr.utf8
@@ -610,6 +606,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/core.html.tr.utf8
 #srv/web/ipfire/manual/mod/directive-dict.html
 #srv/web/ipfire/manual/mod/directive-dict.html.en
+#srv/web/ipfire/manual/mod/directive-dict.html.es
 #srv/web/ipfire/manual/mod/directive-dict.html.fr
 #srv/web/ipfire/manual/mod/directive-dict.html.ja.utf8
 #srv/web/ipfire/manual/mod/directive-dict.html.ko.euc-kr
@@ -697,6 +694,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mod_authn_socache.html.fr
 #srv/web/ipfire/manual/mod/mod_authnz_fcgi.html
 #srv/web/ipfire/manual/mod/mod_authnz_fcgi.html.en
+#srv/web/ipfire/manual/mod/mod_authnz_fcgi.html.fr
 #srv/web/ipfire/manual/mod/mod_authnz_ldap.html
 #srv/web/ipfire/manual/mod/mod_authnz_ldap.html.en
 #srv/web/ipfire/manual/mod/mod_authnz_ldap.html.fr
@@ -734,6 +732,9 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mod_autoindex.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_autoindex.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_autoindex.html.tr.utf8
+#srv/web/ipfire/manual/mod/mod_brotli.html
+#srv/web/ipfire/manual/mod/mod_brotli.html.en
+#srv/web/ipfire/manual/mod/mod_brotli.html.fr
 #srv/web/ipfire/manual/mod/mod_buffer.html
 #srv/web/ipfire/manual/mod/mod_buffer.html.en
 #srv/web/ipfire/manual/mod/mod_buffer.html.fr
@@ -851,6 +852,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mod_heartmonitor.html.fr
 #srv/web/ipfire/manual/mod/mod_http2.html
 #srv/web/ipfire/manual/mod/mod_http2.html.en
+#srv/web/ipfire/manual/mod/mod_http2.html.fr
 #srv/web/ipfire/manual/mod/mod_ident.html
 #srv/web/ipfire/manual/mod/mod_ident.html.en
 #srv/web/ipfire/manual/mod/mod_ident.html.fr
@@ -914,6 +916,8 @@ srv/web/ipfire/html/captive
 #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
@@ -961,6 +965,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mod_proxy_ftp.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy_hcheck.html
 #srv/web/ipfire/manual/mod/mod_proxy_hcheck.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_hcheck.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy_html.html
 #srv/web/ipfire/manual/mod/mod_proxy_html.html.en
 #srv/web/ipfire/manual/mod/mod_proxy_html.html.fr
@@ -969,11 +974,15 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mod_proxy_http.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy_http2.html
 #srv/web/ipfire/manual/mod/mod_proxy_http2.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_http2.html.fr
 #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_proxy_wstunnel.html.fr
 #srv/web/ipfire/manual/mod/mod_ratelimit.html
 #srv/web/ipfire/manual/mod/mod_ratelimit.html.en
 #srv/web/ipfire/manual/mod/mod_ratelimit.html.fr
@@ -1081,6 +1090,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mod_usertrack.html.fr
 #srv/web/ipfire/manual/mod/mod_version.html
 #srv/web/ipfire/manual/mod/mod_version.html.en
+#srv/web/ipfire/manual/mod/mod_version.html.fr
 #srv/web/ipfire/manual/mod/mod_version.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_version.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_vhost_alias.html
@@ -1089,6 +1099,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mod_vhost_alias.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_watchdog.html
 #srv/web/ipfire/manual/mod/mod_watchdog.html.en
+#srv/web/ipfire/manual/mod/mod_watchdog.html.fr
 #srv/web/ipfire/manual/mod/mod_xml2enc.html
 #srv/web/ipfire/manual/mod/mod_xml2enc.html.en
 #srv/web/ipfire/manual/mod/mod_xml2enc.html.fr
@@ -1185,6 +1196,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/platform/perf-hp.html.ko.euc-kr
 #srv/web/ipfire/manual/platform/rpm.html
 #srv/web/ipfire/manual/platform/rpm.html.en
+#srv/web/ipfire/manual/platform/rpm.html.fr
 #srv/web/ipfire/manual/platform/win_compiling.html
 #srv/web/ipfire/manual/platform/win_compiling.html.en
 #srv/web/ipfire/manual/platform/win_compiling.html.fr
@@ -1260,6 +1272,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/programs/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/programs/log_server_status.html
 #srv/web/ipfire/manual/programs/log_server_status.html.en
+#srv/web/ipfire/manual/programs/log_server_status.html.fr
 #srv/web/ipfire/manual/programs/logresolve.html
 #srv/web/ipfire/manual/programs/logresolve.html.en
 #srv/web/ipfire/manual/programs/logresolve.html.fr
@@ -1277,8 +1290,10 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/programs/rotatelogs.html.tr.utf8
 #srv/web/ipfire/manual/programs/split-logfile.html
 #srv/web/ipfire/manual/programs/split-logfile.html.en
+#srv/web/ipfire/manual/programs/split-logfile.html.fr
 #srv/web/ipfire/manual/programs/suexec.html
 #srv/web/ipfire/manual/programs/suexec.html.en
+#srv/web/ipfire/manual/programs/suexec.html.fr
 #srv/web/ipfire/manual/programs/suexec.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/suexec.html.tr.utf8
 #srv/web/ipfire/manual/rewrite
@@ -1613,6 +1628,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
@@ -1643,7 +1659,6 @@ usr/lib/apache/mod_version.so
 usr/lib/apache/mod_vhost_alias.so
 usr/lib/apache/mod_watchdog.so
 usr/lib/apache/mod_xml2enc.so
-#usr/sbin/ab
 usr/sbin/apachectl
 #usr/sbin/checkgid
 #usr/sbin/envvars