Update to apache 2.4.27

- Updated to apache 2.4
- Updated the htpasswd generation to use the more secure bcrypt algorithm

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/httpd/httpd.conf b/config/httpd/httpd.conf
index 9c1fb2b1001bf6e53ee5f79f112786b40e46fe27..14dcc735c39eae7e41977e6dcb3fe4c31f62e4d9 100644 (file)
--- a/config/httpd/httpd.conf
+++ b/config/httpd/httpd.conf
@@ -65,7 +65,6 @@ Include /etc/httpd/conf/global.conf
 
 # associate MIME types with filename extensions
 TypesConfig /etc/mime.types
-DefaultType text/plain
 
 # global (server-wide) SSL configuration, that is not specific to 
 # any virtual host
@@ -80,8 +79,7 @@ Include /etc/httpd/conf/ssl-global.conf
 AccessFileName .htaccess
 # and never show them
 <Files ~ "^\.ht">
-    Order allow,deny
-    Deny from all
+    Require all denied
 </Files>
 
 # List of resources to look for when the client requests a directory

diff --git a/config/httpd/loadmodule.conf b/config/httpd/loadmodule.conf
index e30f79b28a215d53ad5f3ca4704e8f0002a838ee..249221e8cba318c05492383f99f82caa127e7bd0 100644 (file)
--- a/config/httpd/loadmodule.conf
+++ b/config/httpd/loadmodule.conf
@@ -1,8 +1,11 @@
 LoadModule authn_file_module /usr/lib/apache/mod_authn_file.so
+LoadModule unixd_module /usr/lib/apache/mod_unixd.so
 #LoadModule authn_dbm_module /usr/lib/apache/mod_authn_dbm.so
 #LoadModule authn_anon_module /usr/lib/apache/mod_authn_anon.so
 #LoadModule authn_dbd_module /usr/lib/apache/mod_authn_dbd.so
 #LoadModule authn_default_module /usr/lib/apache/mod_authn_default.so
+LoadModule authn_core_module /usr/lib/apache/mod_authn_core.so
+LoadModule authz_core_module /usr/lib/apache/mod_authz_core.so
 LoadModule authz_host_module /usr/lib/apache/mod_authz_host.so
 #LoadModule authz_groupfile_module /usr/lib/apache/mod_authz_groupfile.so
 LoadModule authz_user_module /usr/lib/apache/mod_authz_user.so
@@ -10,7 +13,7 @@ LoadModule authz_user_module /usr/lib/apache/mod_authz_user.so
 #LoadModule authz_owner_module /usr/lib/apache/mod_authz_owner.so
 #LoadModule authz_default_module /usr/lib/apache/mod_authz_default.so
 LoadModule auth_basic_module /usr/lib/apache/mod_auth_basic.so
-LoadModule auth_digest_module /usr/lib/apache/mod_auth_digest.so
+#LoadModule auth_digest_module /usr/lib/apache/mod_auth_digest.so
 #LoadModule dbd_module /usr/lib/apache/mod_dbd.so
 #LoadModule dumpio_module /usr/lib/apache/mod_dumpio.so
 #LoadModule ext_filter_module /usr/lib/apache/mod_ext_filter.so
@@ -33,10 +36,10 @@ LoadModule setenvif_module /usr/lib/apache/mod_setenvif.so
 LoadModule mime_module /usr/lib/apache/mod_mime.so
 #LoadModule dav_module /usr/lib/apache/mod_dav.so
 #LoadModule status_module /usr/lib/apache/mod_status.so
-LoadModule autoindex_module /usr/lib/apache/mod_autoindex.so
+#LoadModule autoindex_module /usr/lib/apache/mod_autoindex.so
 #LoadModule asis_module /usr/lib/apache/mod_asis.so
 #LoadModule info_module /usr/lib/apache/mod_info.so
-LoadModule cgi_module /usr/lib/apache/mod_cgi.so
+LoadModule cgid_module /usr/lib/apache/mod_cgid.so
 #LoadModule dav_fs_module /usr/lib/apache/mod_dav_fs.so
 #LoadModule vhost_alias_module /usr/lib/apache/mod_vhost_alias.so
 #LoadModule negotiation_module /usr/lib/apache/mod_negotiation.so
@@ -47,5 +50,6 @@ LoadModule dir_module /usr/lib/apache/mod_dir.so
 #LoadModule userdir_module /usr/lib/apache/mod_userdir.so
 LoadModule alias_module /usr/lib/apache/mod_alias.so
 LoadModule rewrite_module /usr/lib/apache/mod_rewrite.so
+LoadModule socache_shmcb_module /usr/lib/apache/mod_socache_shmcb.so
 LoadModule ssl_module /usr/lib/apache/mod_ssl.so
 LoadModule php5_module /usr/lib/apache/libphp5.so

diff --git a/config/httpd/server-tuning.conf b/config/httpd/server-tuning.conf
index 90410186d9f2495f5888ba1c19b29cb7930fdaa0..5642a1e4409c81698e40a82b3c65233effea56e0 100644 (file)
--- a/config/httpd/server-tuning.conf
+++ b/config/httpd/server-tuning.conf
@@ -17,10 +17,11 @@ MaxKeepAliveRequests 100
 #
 KeepAliveTimeout 15
 
-MinSpareServers 1
-MaxSpareServers 10
+MinSpareThreads 1
+MaxSpareThreads 20
 StartServers 2
-MaxClients 256
+MaxRequestWorkers 256
+ThreadsPerChild 16
 
 #
 # The following directives modify normal HTTP response behavior to

diff --git a/config/httpd/ssl-global.conf b/config/httpd/ssl-global.conf
index 9cf4f8150bd133a5076c7587983a5ed1ca62f8ce..154815cea5202279e66c75ec31eaa1ec702b8cfd 100644 (file)
--- a/config/httpd/ssl-global.conf
+++ b/config/httpd/ssl-global.conf
@@ -39,11 +39,6 @@
        SSLSessionCache         shmcb:/var/log/httpd/ssl_scache(512000)
        SSLSessionCacheTimeout  900
 
-       #   Semaphore:
-       #   Configure the path to the mutual exclusion semaphore the
-       #   SSL engine uses internally for inter-process synchronization. 
-       SSLMutex  file:/var/log/httpd/ssl_mutex
-
        #   Pseudo Random Number Generator (PRNG):
        #   Configure one or more sources to seed the PRNG of the 
        #   SSL library. The seed data should be of good random quality.

diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf b/config/httpd/vhosts.d/ipfire-interface-ssl.conf
index 4897d56d28641d7558ca6ab53b6a149cfe6eaed8..6f353962ec7ea3ef3e1018275c54935d42a6d67b 100644 (file)
--- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf
+++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf
@@ -17,8 +17,7 @@
     <Directory /srv/web/ipfire/html>
         Options ExecCGI
         AllowOverride None
-        Order allow,deny
-        Allow from all
+        Require all granted
     </Directory>
     <DirectoryMatch "/srv/web/ipfire/html/(graphs|sgraph)">
         AuthName "IPFire - Restricted"
@@ -34,13 +33,11 @@
         AuthType Basic
         AuthUserFile /var/ipfire/auth/users
         Require user admin
-         <Files chpasswd.cgi>
-            Satisfy Any
-            Allow from All
+        <Files chpasswd.cgi>
+            Require all granted
         </Files>
         <Files webaccess.cgi>
-            Satisfy Any
-            Allow from All
+            Require all granted
         </Files>
         <Files dial.cgi>
             Require user admin
@@ -71,16 +68,14 @@
        <Directory /var/updatecache>
                 Options ExecCGI
                 AllowOverride None
-                Order deny,allow
-                Allow from all
+                Require all granted
        </Directory>
 
     Alias /repository/ /var/urlrepo/
        <Directory /var/urlrepo>
                 Options ExecCGI
                 AllowOverride None
-                Order deny,allow
-                Allow from all
+                Require all granted
        </Directory>
 
     Alias /proxy-reports/ /var/log/sarg/

diff --git a/config/httpd/vhosts.d/ipfire-interface.conf b/config/httpd/vhosts.d/ipfire-interface.conf
index c7c05972ed8cbdcf3749b27699b42b6dbda29de0..619f90fcc13c9149371605ac38610e2eed3a02e0 100644 (file)
--- a/config/httpd/vhosts.d/ipfire-interface.conf
+++ b/config/httpd/vhosts.d/ipfire-interface.conf
@@ -9,8 +9,7 @@
     <Directory /srv/web/ipfire/html>
         Options ExecCGI
         AllowOverride None
-        Order allow,deny
-        Allow from all
+        Require all granted
     </Directory>
     <DirectoryMatch "/srv/web/ipfire/html/(graphs|sgraph)">
         AuthName "IPFire - Restricted"
@@ -27,12 +26,10 @@
         AuthUserFile /var/ipfire/auth/users
         Require user admin
          <Files chpasswd.cgi>
-            Satisfy Any
-            Allow from All
+            Require all granted
         </Files>
         <Files webaccess.cgi>
-            Satisfy Any
-            Allow from All
+            Require all granted
         </Files>
         <Files dial.cgi>
             Require user admin
@@ -50,15 +47,13 @@
        <Directory /var/updatecache>
                 Options ExecCGI
                 AllowOverride None
-                Order deny,allow
-                Allow from all
+                Require all granted
        </Directory>
     Alias /repository/ /var/urlrepo/
        <Directory /var/urlrepo>
                 Options ExecCGI
                 AllowOverride None
-                Order deny,allow
-                Allow from all
+                Require all granted
        </Directory>
     Alias /wpad.dat /srv/web/ipfire/html/proxy.pac
 </VirtualHost>

diff --git a/config/httpd/vhosts.d/nagios.conf b/config/httpd/vhosts.d/nagios.conf
index 78bcd3b00ebbc5ca4439edb0d701d7e7a39ec77f..8a320d793b8058c3f78f856fdd2682bb4ad9d966 100644 (file)
--- a/config/httpd/vhosts.d/nagios.conf
+++ b/config/httpd/vhosts.d/nagios.conf
@@ -16,11 +16,8 @@ ScriptAlias /nagios/cgi-bin "/usr/share/nagios/cgi-bin"
 #  SSLRequireSSL
    Options ExecCGI
    AllowOverride None
-   Order allow,deny
-   Allow from all
-#  Order deny,allow
-#  Deny from all
-#  Allow from 127.0.0.1
+#  Require all granted
+#  Require ip 127.0.0.1
    AuthName "Nagios Access"
    AuthType Basic
    AuthUserFile /etc/nagios/htpasswd.users
@@ -33,11 +30,8 @@ Alias /nagios "/usr/share/nagios"
 #  SSLRequireSSL
    Options None
    AllowOverride None
-   Order allow,deny
-   Allow from all
-#  Order deny,allow
-#  Deny from all
-#  Allow from 127.0.0.1
+#  Require all granted
+#  Require ip 127.0.0.1
    AuthName "Nagios Access"
    AuthType Basic
    AuthUserFile /etc/nagios/htpasswd.users

diff --git a/config/httpd/vhosts.d/openmailadmin.conf b/config/httpd/vhosts.d/openmailadmin.conf
index 6e7aaef40ebd8116d5f4d6c51f771170915f4078..e91be3978f4c3ce5bb36a03073ec7654269e4226 100644 (file)
--- a/config/httpd/vhosts.d/openmailadmin.conf
+++ b/config/httpd/vhosts.d/openmailadmin.conf
@@ -9,8 +9,7 @@ Listen 1001
        <Directory /srv/web/openmailadmin>
                Options +FollowSymlinks
                AllowOverride None
-               Order allow,deny
-               Allow from all
+               Require all granted
        </Directory>
        
 </VirtualHost>

diff --git a/config/icinga/icinga.conf b/config/icinga/icinga.conf
index 3771812d1c9ce8cea01097bcf254b4325dcfc4c5..6060b1b0156e2551f4222eb8999c04f010334f90 100644 (file)
--- a/config/icinga/icinga.conf
+++ b/config/icinga/icinga.conf
@@ -15,9 +15,6 @@ Listen 1010
                AuthType Basic
                AuthUserFile /etc/icinga/htpasswd.users
 
-               Order allow,deny
-               Allow from all
-
                Require valid-user
        </Directory>
 
@@ -29,9 +26,6 @@ Listen 1010
                AuthType Basic
                AuthUserFile /etc/icinga/htpasswd.users
 
-               Order allow,deny
-               Allow from all
-
                Require valid-user
        </Directory>
 </VirtualHost>

diff --git a/config/nagiosql/nagios.conf b/config/nagiosql/nagios.conf
index 6161d4d208a5a299a1c8b184b6d01ea25e0cb473..3805d382a2a3cf57f6070e4e85ee61f7f6578bde 100644 (file)
--- a/config/nagiosql/nagios.conf
+++ b/config/nagiosql/nagios.conf
@@ -16,11 +16,8 @@ ScriptAlias /nagios/cgi-bin "/usr/share/nagios/cgi-bin"
 #  SSLRequireSSL
    Options ExecCGI
    AllowOverride None
-   Order allow,deny
-   Allow from all
-#  Order deny,allow
-#  Deny from all
-#  Allow from 127.0.0.1
+#  Require all granted
+#  Require ip 127.0.0.1
    AuthName "Nagios Access"
    AuthType Basic
    AuthUserFile /etc/nagios/htpasswd.users
@@ -33,11 +30,8 @@ Alias /nagios "/usr/share/nagios"
 #  SSLRequireSSL
    Options None
    AllowOverride None
-   Order allow,deny
-   Allow from all
-#  Order deny,allow
-#  Deny from all
-#  Allow from 127.0.0.1
+#  Require all granted
+#  Require ip 127.0.0.1
    AuthName "Nagios Access"
    AuthType Basic
    AuthUserFile /etc/nagios/htpasswd.users
@@ -50,8 +44,7 @@ Alias /nagiosql "/usr/share/nagiosql"
    include /etc/httpd/conf/conf.d/php*.conf
    Options None
    AllowOverride None
-   Order allow,deny
-   Allow from all
+   Require all granted
 </Directory>
 
 </VirtualHost>

diff --git a/config/owncloud/owncloud.conf b/config/owncloud/owncloud.conf
index 08f58c36c043625918ca1927970751123c06d6df..d4332ec55bf93c362ac286655405075758c6eacb 100644 (file)
--- a/config/owncloud/owncloud.conf
+++ b/config/owncloud/owncloud.conf
@@ -15,7 +15,6 @@ Listen 1011
        <Directory /srv/web/owncloud>
                Options Indexes FollowSymlinks MultiViews
                AllowOverride ALL
-               Order allow,deny
-               Allow from all
+               Require all granted
        </Directory>
 </VirtualHost>

diff --git a/config/php/php.ini b/config/php/php.ini
index 6e820949663007bb3be7f4e8a413693b461d0925..2e73507d495a7482dace4b535ab2b5f94ef91f6a 100644 (file)
--- a/config/php/php.ini
+++ b/config/php/php.ini
@@ -533,7 +533,7 @@ doc_root =
 user_dir =
 
 ; Directory in which the loadable extensions (modules) reside.
-extension_dir = "/usr/lib/php/extensions/no-debug-non-zts-20090626/"
+extension_dir = "/usr/lib/php/extensions/no-debug-zts-20090626/"
 
 ; Whether or not to enable the dl() function.  The dl() function does NOT work
 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically

diff --git a/config/phpSANE/phpSANE.conf b/config/phpSANE/phpSANE.conf
index 06824e1bbf795d26e70a728da113d8b8dbf40da4..3956019ef816fad8067330bf96c9e830ffdbaa01 100644 (file)
--- a/config/phpSANE/phpSANE.conf
+++ b/config/phpSANE/phpSANE.conf
@@ -9,8 +9,7 @@ Listen 1003
        <Directory /srv/web/phpSANE>
                Options None
                AllowOverride None
-               Order allow,deny
-               Allow from all
+               Require all granted
        </Directory>
        
 </VirtualHost>

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 0f4939c001d5a70b21e1a8d1aa3ed663318895a5..53b6ce9f0bcba27029a27e3b101741fe5bc99330 100644 (file)
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -15,6 +15,7 @@ etc/httpd/conf/default-server.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/extra/proxy-html.conf
 etc/httpd/conf/global.conf
 etc/httpd/conf/hostname.conf
 etc/httpd/conf/httpd.conf
@@ -36,6 +37,7 @@ etc/httpd/conf/mod_log_config.conf
 #etc/httpd/conf/original/extra/httpd-ssl.conf
 #etc/httpd/conf/original/extra/httpd-userdir.conf
 #etc/httpd/conf/original/extra/httpd-vhosts.conf
+#etc/httpd/conf/original/extra/proxy-html.conf
 #etc/httpd/conf/original/httpd.conf
 etc/httpd/conf/server-tuning.conf
 etc/httpd/conf/ssl-global.conf
@@ -47,8 +49,21 @@ etc/httpd/conf/vhosts.d/ipfire-interface.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
+#srv/web/ipfire/cgi-bin/printenv.wsf
 #srv/web/ipfire/cgi-bin/test-cgi
 #srv/web/ipfire/error
 #srv/web/ipfire/error/HTTP_BAD_GATEWAY.html.var
@@ -87,9 +102,9 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/icons/alert.red.png
 #srv/web/ipfire/icons/apache_pb.gif
 #srv/web/ipfire/icons/apache_pb.png
+#srv/web/ipfire/icons/apache_pb.svg
 #srv/web/ipfire/icons/apache_pb2.gif
 #srv/web/ipfire/icons/apache_pb2.png
-#srv/web/ipfire/icons/apache_pb2_ani.gif
 #srv/web/ipfire/icons/back.gif
 #srv/web/ipfire/icons/back.png
 #srv/web/ipfire/icons/ball.gray.gif
@@ -168,6 +183,23 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/icons/link.png
 #srv/web/ipfire/icons/movie.gif
 #srv/web/ipfire/icons/movie.png
+#srv/web/ipfire/icons/odf6odb.png
+#srv/web/ipfire/icons/odf6odc.png
+#srv/web/ipfire/icons/odf6odf.png
+#srv/web/ipfire/icons/odf6odg.png
+#srv/web/ipfire/icons/odf6odi.png
+#srv/web/ipfire/icons/odf6odm.png
+#srv/web/ipfire/icons/odf6odp.png
+#srv/web/ipfire/icons/odf6ods.png
+#srv/web/ipfire/icons/odf6odt.png
+#srv/web/ipfire/icons/odf6otc.png
+#srv/web/ipfire/icons/odf6otf.png
+#srv/web/ipfire/icons/odf6otg.png
+#srv/web/ipfire/icons/odf6oth.png
+#srv/web/ipfire/icons/odf6oti.png
+#srv/web/ipfire/icons/odf6otp.png
+#srv/web/ipfire/icons/odf6ots.png
+#srv/web/ipfire/icons/odf6ott.png
 #srv/web/ipfire/icons/p.gif
 #srv/web/ipfire/icons/p.png
 #srv/web/ipfire/icons/patch.gif
@@ -227,12 +259,12 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/icons/small/compressed.png
 #srv/web/ipfire/icons/small/continued.gif
 #srv/web/ipfire/icons/small/continued.png
-#srv/web/ipfire/icons/small/dir.gif
-#srv/web/ipfire/icons/small/dir.png
-#srv/web/ipfire/icons/small/dir2.gif
-#srv/web/ipfire/icons/small/dir2.png
 #srv/web/ipfire/icons/small/doc.gif
 #srv/web/ipfire/icons/small/doc.png
+#srv/web/ipfire/icons/small/folder.gif
+#srv/web/ipfire/icons/small/folder.png
+#srv/web/ipfire/icons/small/folder2.gif
+#srv/web/ipfire/icons/small/folder2.png
 #srv/web/ipfire/icons/small/forward.gif
 #srv/web/ipfire/icons/small/forward.png
 #srv/web/ipfire/icons/small/generic.gif
@@ -279,6 +311,7 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/icons/sphere1.png
 #srv/web/ipfire/icons/sphere2.gif
 #srv/web/ipfire/icons/sphere2.png
+#srv/web/ipfire/icons/svg.png
 #srv/web/ipfire/icons/tar.gif
 #srv/web/ipfire/icons/tar.png
 #srv/web/ipfire/icons/tex.gif
@@ -299,7 +332,9 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/icons/world1.png
 #srv/web/ipfire/icons/world2.gif
 #srv/web/ipfire/icons/world2.png
+#srv/web/ipfire/icons/xml.png
 #srv/web/ipfire/manual
+#srv/web/ipfire/manual/BUILDING
 #srv/web/ipfire/manual/LICENSE
 #srv/web/ipfire/manual/bind.html
 #srv/web/ipfire/manual/bind.html.de
@@ -329,6 +364,7 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/custom-error.html
 #srv/web/ipfire/manual/custom-error.html.en
 #srv/web/ipfire/manual/custom-error.html.es
+#srv/web/ipfire/manual/custom-error.html.fr
 #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
@@ -347,31 +383,45 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/developer/index.html
 #srv/web/ipfire/manual/developer/index.html.en
 #srv/web/ipfire/manual/developer/index.html.zh-cn.utf8
+#srv/web/ipfire/manual/developer/modguide.html
+#srv/web/ipfire/manual/developer/modguide.html.en
 #srv/web/ipfire/manual/developer/modules.html
 #srv/web/ipfire/manual/developer/modules.html.en
 #srv/web/ipfire/manual/developer/modules.html.ja.utf8
+#srv/web/ipfire/manual/developer/new_api_2_4.html
+#srv/web/ipfire/manual/developer/new_api_2_4.html.en
+#srv/web/ipfire/manual/developer/output-filters.html
+#srv/web/ipfire/manual/developer/output-filters.html.en
 #srv/web/ipfire/manual/developer/request.html
 #srv/web/ipfire/manual/developer/request.html.en
 #srv/web/ipfire/manual/developer/thread_safety.html
 #srv/web/ipfire/manual/developer/thread_safety.html.en
 #srv/web/ipfire/manual/dns-caveats.html
 #srv/web/ipfire/manual/dns-caveats.html.en
+#srv/web/ipfire/manual/dns-caveats.html.fr
 #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.fr
 #srv/web/ipfire/manual/dso.html.ja.utf8
 #srv/web/ipfire/manual/dso.html.ko.euc-kr
 #srv/web/ipfire/manual/dso.html.tr.utf8
 #srv/web/ipfire/manual/env.html
 #srv/web/ipfire/manual/env.html.en
+#srv/web/ipfire/manual/env.html.fr
 #srv/web/ipfire/manual/env.html.ja.utf8
 #srv/web/ipfire/manual/env.html.ko.euc-kr
 #srv/web/ipfire/manual/env.html.tr.utf8
+#srv/web/ipfire/manual/expr.html
+#srv/web/ipfire/manual/expr.html.en
+#srv/web/ipfire/manual/expr.html.fr
 #srv/web/ipfire/manual/faq
 #srv/web/ipfire/manual/faq/index.html
 #srv/web/ipfire/manual/faq/index.html.en
+#srv/web/ipfire/manual/faq/index.html.es
+#srv/web/ipfire/manual/faq/index.html.fr
 #srv/web/ipfire/manual/faq/index.html.tr.utf8
 #srv/web/ipfire/manual/faq/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/filter.html
@@ -381,6 +431,9 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/filter.html.ja.utf8
 #srv/web/ipfire/manual/filter.html.ko.euc-kr
 #srv/web/ipfire/manual/filter.html.tr.utf8
+#srv/web/ipfire/manual/getting-started.html
+#srv/web/ipfire/manual/getting-started.html.en
+#srv/web/ipfire/manual/getting-started.html.fr
 #srv/web/ipfire/manual/glossary.html
 #srv/web/ipfire/manual/glossary.html.de
 #srv/web/ipfire/manual/glossary.html.en
@@ -395,12 +448,12 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/handler.html.fr
 #srv/web/ipfire/manual/handler.html.ja.utf8
 #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.utf8
 #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.fr
 #srv/web/ipfire/manual/howto/auth.html
 #srv/web/ipfire/manual/howto/auth.html.en
 #srv/web/ipfire/manual/howto/auth.html.fr
@@ -409,6 +462,7 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #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.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
@@ -417,22 +471,35 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #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/index.html
 #srv/web/ipfire/manual/howto/index.html.en
+#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.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/ssi.html
 #srv/web/ipfire/manual/howto/ssi.html.en
+#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
 #srv/web/ipfire/manual/images
 #srv/web/ipfire/manual/images/apache_header.gif
+#srv/web/ipfire/manual/images/bal-man-b.png
+#srv/web/ipfire/manual/images/bal-man-w.png
+#srv/web/ipfire/manual/images/bal-man.png
+#srv/web/ipfire/manual/images/build_a_mod_2.png
+#srv/web/ipfire/manual/images/build_a_mod_3.png
+#srv/web/ipfire/manual/images/build_a_mod_4.png
 #srv/web/ipfire/manual/images/caching_fig1.gif
 #srv/web/ipfire/manual/images/caching_fig1.png
 #srv/web/ipfire/manual/images/caching_fig1.tr.png
@@ -456,7 +523,9 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/images/mod_rewrite_fig2.gif
 #srv/web/ipfire/manual/images/mod_rewrite_fig2.png
 #srv/web/ipfire/manual/images/pixel.gif
+#srv/web/ipfire/manual/images/reverse-proxy-arch.png
 #srv/web/ipfire/manual/images/rewrite_backreferences.png
+#srv/web/ipfire/manual/images/rewrite_process_uri.png
 #srv/web/ipfire/manual/images/rewrite_rule_flow.png
 #srv/web/ipfire/manual/images/right.gif
 #srv/web/ipfire/manual/images/ssl_intro_fig1.gif
@@ -470,6 +539,7 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/images/syntax_rewriterule.png
 #srv/web/ipfire/manual/images/up.gif
 #srv/web/ipfire/manual/index.html
+#srv/web/ipfire/manual/index.html.da
 #srv/web/ipfire/manual/index.html.de
 #srv/web/ipfire/manual/index.html.en
 #srv/web/ipfire/manual/index.html.es
@@ -494,7 +564,6 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/invoking.html.fr
 #srv/web/ipfire/manual/invoking.html.ja.utf8
 #srv/web/ipfire/manual/invoking.html.ko.euc-kr
-#srv/web/ipfire/manual/invoking.html.ru.koi8-r
 #srv/web/ipfire/manual/invoking.html.tr.utf8
 #srv/web/ipfire/manual/license.html
 #srv/web/ipfire/manual/license.html.en
@@ -507,39 +576,38 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #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.fr
 #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.utf8
 #srv/web/ipfire/manual/misc/password_encryptions.html
 #srv/web/ipfire/manual/misc/password_encryptions.html.en
+#srv/web/ipfire/manual/misc/password_encryptions.html.fr
 #srv/web/ipfire/manual/misc/perf-tuning.html
 #srv/web/ipfire/manual/misc/perf-tuning.html.en
+#srv/web/ipfire/manual/misc/perf-tuning.html.fr
 #srv/web/ipfire/manual/misc/perf-tuning.html.ko.euc-kr
 #srv/web/ipfire/manual/misc/perf-tuning.html.tr.utf8
 #srv/web/ipfire/manual/misc/relevant_standards.html
 #srv/web/ipfire/manual/misc/relevant_standards.html.en
+#srv/web/ipfire/manual/misc/relevant_standards.html.fr
 #srv/web/ipfire/manual/misc/relevant_standards.html.ko.euc-kr
-#srv/web/ipfire/manual/misc/rewriteguide.html
-#srv/web/ipfire/manual/misc/rewriteguide.html.en
-#srv/web/ipfire/manual/misc/rewriteguide.html.ko.euc-kr
 #srv/web/ipfire/manual/misc/security_tips.html
 #srv/web/ipfire/manual/misc/security_tips.html.en
+#srv/web/ipfire/manual/misc/security_tips.html.fr
 #srv/web/ipfire/manual/misc/security_tips.html.ko.euc-kr
 #srv/web/ipfire/manual/misc/security_tips.html.tr.utf8
 #srv/web/ipfire/manual/mod
-#srv/web/ipfire/manual/mod/beos.html
-#srv/web/ipfire/manual/mod/beos.html.de
-#srv/web/ipfire/manual/mod/beos.html.en
-#srv/web/ipfire/manual/mod/beos.html.es
-#srv/web/ipfire/manual/mod/beos.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/core.html
 #srv/web/ipfire/manual/mod/core.html.de
 #srv/web/ipfire/manual/mod/core.html.en
+#srv/web/ipfire/manual/mod/core.html.es
 #srv/web/ipfire/manual/mod/core.html.fr
 #srv/web/ipfire/manual/mod/core.html.ja.utf8
 #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.fr
 #srv/web/ipfire/manual/mod/directive-dict.html.ja.utf8
 #srv/web/ipfire/manual/mod/directive-dict.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/directive-dict.html.tr.utf8
@@ -547,33 +615,45 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/mod/directives.html.de
 #srv/web/ipfire/manual/mod/directives.html.en
 #srv/web/ipfire/manual/mod/directives.html.es
+#srv/web/ipfire/manual/mod/directives.html.fr
 #srv/web/ipfire/manual/mod/directives.html.ja.utf8
 #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.utf8
 #srv/web/ipfire/manual/mod/event.html
 #srv/web/ipfire/manual/mod/event.html.en
+#srv/web/ipfire/manual/mod/event.html.fr
 #srv/web/ipfire/manual/mod/index.html
 #srv/web/ipfire/manual/mod/index.html.de
 #srv/web/ipfire/manual/mod/index.html.en
 #srv/web/ipfire/manual/mod/index.html.es
+#srv/web/ipfire/manual/mod/index.html.fr
 #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.utf8
+#srv/web/ipfire/manual/mod/mod_access_compat.html
+#srv/web/ipfire/manual/mod/mod_access_compat.html.en
+#srv/web/ipfire/manual/mod/mod_access_compat.html.fr
+#srv/web/ipfire/manual/mod/mod_access_compat.html.ja.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
+#srv/web/ipfire/manual/mod/mod_actions.html.fr
 #srv/web/ipfire/manual/mod/mod_actions.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_actions.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_alias.html
 #srv/web/ipfire/manual/mod/mod_alias.html.en
+#srv/web/ipfire/manual/mod/mod_alias.html.fr
 #srv/web/ipfire/manual/mod/mod_alias.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_alias.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_alias.html.tr.utf8
+#srv/web/ipfire/manual/mod/mod_allowmethods.html
+#srv/web/ipfire/manual/mod/mod_allowmethods.html.en
+#srv/web/ipfire/manual/mod/mod_allowmethods.html.fr
 #srv/web/ipfire/manual/mod/mod_asis.html
 #srv/web/ipfire/manual/mod/mod_asis.html.en
+#srv/web/ipfire/manual/mod/mod_asis.html.fr
 #srv/web/ipfire/manual/mod/mod_asis.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_asis.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_auth_basic.html
@@ -585,53 +665,64 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/mod/mod_auth_digest.html.en
 #srv/web/ipfire/manual/mod/mod_auth_digest.html.fr
 #srv/web/ipfire/manual/mod/mod_auth_digest.html.ko.euc-kr
-#srv/web/ipfire/manual/mod/mod_authn_alias.html
-#srv/web/ipfire/manual/mod/mod_authn_alias.html.en
-#srv/web/ipfire/manual/mod/mod_authn_alias.html.fr
+#srv/web/ipfire/manual/mod/mod_auth_form.html
+#srv/web/ipfire/manual/mod/mod_auth_form.html.en
+#srv/web/ipfire/manual/mod/mod_auth_form.html.fr
 #srv/web/ipfire/manual/mod/mod_authn_anon.html
 #srv/web/ipfire/manual/mod/mod_authn_anon.html.en
+#srv/web/ipfire/manual/mod/mod_authn_anon.html.fr
 #srv/web/ipfire/manual/mod/mod_authn_anon.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authn_anon.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_authn_core.html
+#srv/web/ipfire/manual/mod/mod_authn_core.html.en
+#srv/web/ipfire/manual/mod/mod_authn_core.html.fr
 #srv/web/ipfire/manual/mod/mod_authn_dbd.html
 #srv/web/ipfire/manual/mod/mod_authn_dbd.html.en
+#srv/web/ipfire/manual/mod/mod_authn_dbd.html.fr
 #srv/web/ipfire/manual/mod/mod_authn_dbm.html
 #srv/web/ipfire/manual/mod/mod_authn_dbm.html.en
+#srv/web/ipfire/manual/mod/mod_authn_dbm.html.fr
 #srv/web/ipfire/manual/mod/mod_authn_dbm.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authn_dbm.html.ko.euc-kr
-#srv/web/ipfire/manual/mod/mod_authn_default.html
-#srv/web/ipfire/manual/mod/mod_authn_default.html.en
-#srv/web/ipfire/manual/mod/mod_authn_default.html.ja.utf8
-#srv/web/ipfire/manual/mod/mod_authn_default.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authn_file.html
 #srv/web/ipfire/manual/mod/mod_authn_file.html.en
 #srv/web/ipfire/manual/mod/mod_authn_file.html.fr
 #srv/web/ipfire/manual/mod/mod_authn_file.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authn_file.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_authn_socache.html
+#srv/web/ipfire/manual/mod/mod_authn_socache.html.en
+#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_ldap.html
 #srv/web/ipfire/manual/mod/mod_authnz_ldap.html.en
 #srv/web/ipfire/manual/mod/mod_authnz_ldap.html.fr
+#srv/web/ipfire/manual/mod/mod_authz_core.html
+#srv/web/ipfire/manual/mod/mod_authz_core.html.en
+#srv/web/ipfire/manual/mod/mod_authz_core.html.fr
+#srv/web/ipfire/manual/mod/mod_authz_dbd.html
+#srv/web/ipfire/manual/mod/mod_authz_dbd.html.en
+#srv/web/ipfire/manual/mod/mod_authz_dbd.html.fr
 #srv/web/ipfire/manual/mod/mod_authz_dbm.html
 #srv/web/ipfire/manual/mod/mod_authz_dbm.html.en
+#srv/web/ipfire/manual/mod/mod_authz_dbm.html.fr
 #srv/web/ipfire/manual/mod/mod_authz_dbm.html.ko.euc-kr
-#srv/web/ipfire/manual/mod/mod_authz_default.html
-#srv/web/ipfire/manual/mod/mod_authz_default.html.en
-#srv/web/ipfire/manual/mod/mod_authz_default.html.ja.utf8
-#srv/web/ipfire/manual/mod/mod_authz_default.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authz_groupfile.html
 #srv/web/ipfire/manual/mod/mod_authz_groupfile.html.en
+#srv/web/ipfire/manual/mod/mod_authz_groupfile.html.fr
 #srv/web/ipfire/manual/mod/mod_authz_groupfile.html.ja.utf8
 #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
 #srv/web/ipfire/manual/mod/mod_authz_owner.html.en
+#srv/web/ipfire/manual/mod/mod_authz_owner.html.fr
 #srv/web/ipfire/manual/mod/mod_authz_owner.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authz_owner.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authz_user.html
 #srv/web/ipfire/manual/mod/mod_authz_user.html.en
+#srv/web/ipfire/manual/mod/mod_authz_user.html.fr
 #srv/web/ipfire/manual/mod/mod_authz_user.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authz_user.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_autoindex.html
@@ -640,180 +731,327 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #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_buffer.html
+#srv/web/ipfire/manual/mod/mod_buffer.html.en
+#srv/web/ipfire/manual/mod/mod_buffer.html.fr
 #srv/web/ipfire/manual/mod/mod_cache.html
 #srv/web/ipfire/manual/mod/mod_cache.html.en
+#srv/web/ipfire/manual/mod/mod_cache.html.fr
 #srv/web/ipfire/manual/mod/mod_cache.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_cache.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_cache_disk.html
+#srv/web/ipfire/manual/mod/mod_cache_disk.html.en
+#srv/web/ipfire/manual/mod/mod_cache_disk.html.fr
+#srv/web/ipfire/manual/mod/mod_cache_disk.html.ja.utf8
+#srv/web/ipfire/manual/mod/mod_cache_disk.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_cache_socache.html
+#srv/web/ipfire/manual/mod/mod_cache_socache.html.en
+#srv/web/ipfire/manual/mod/mod_cache_socache.html.fr
 #srv/web/ipfire/manual/mod/mod_cern_meta.html
 #srv/web/ipfire/manual/mod/mod_cern_meta.html.en
+#srv/web/ipfire/manual/mod/mod_cern_meta.html.fr
 #srv/web/ipfire/manual/mod/mod_cern_meta.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_cgi.html
 #srv/web/ipfire/manual/mod/mod_cgi.html.en
+#srv/web/ipfire/manual/mod/mod_cgi.html.fr
 #srv/web/ipfire/manual/mod/mod_cgi.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_cgi.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_cgid.html
 #srv/web/ipfire/manual/mod/mod_cgid.html.en
+#srv/web/ipfire/manual/mod/mod_cgid.html.fr
 #srv/web/ipfire/manual/mod/mod_cgid.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_cgid.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_charset_lite.html
 #srv/web/ipfire/manual/mod/mod_charset_lite.html.en
+#srv/web/ipfire/manual/mod/mod_charset_lite.html.fr
 #srv/web/ipfire/manual/mod/mod_charset_lite.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_data.html
+#srv/web/ipfire/manual/mod/mod_data.html.en
+#srv/web/ipfire/manual/mod/mod_data.html.fr
 #srv/web/ipfire/manual/mod/mod_dav.html
 #srv/web/ipfire/manual/mod/mod_dav.html.en
+#srv/web/ipfire/manual/mod/mod_dav.html.fr
 #srv/web/ipfire/manual/mod/mod_dav.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_dav.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_dav_fs.html
 #srv/web/ipfire/manual/mod/mod_dav_fs.html.en
+#srv/web/ipfire/manual/mod/mod_dav_fs.html.fr
 #srv/web/ipfire/manual/mod/mod_dav_fs.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_dav_fs.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_dav_lock.html
 #srv/web/ipfire/manual/mod/mod_dav_lock.html.en
+#srv/web/ipfire/manual/mod/mod_dav_lock.html.fr
 #srv/web/ipfire/manual/mod/mod_dav_lock.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_dbd.html
 #srv/web/ipfire/manual/mod/mod_dbd.html.en
+#srv/web/ipfire/manual/mod/mod_dbd.html.fr
 #srv/web/ipfire/manual/mod/mod_deflate.html
 #srv/web/ipfire/manual/mod/mod_deflate.html.en
+#srv/web/ipfire/manual/mod/mod_deflate.html.fr
 #srv/web/ipfire/manual/mod/mod_deflate.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_deflate.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_dialup.html
+#srv/web/ipfire/manual/mod/mod_dialup.html.en
+#srv/web/ipfire/manual/mod/mod_dialup.html.fr
 #srv/web/ipfire/manual/mod/mod_dir.html
 #srv/web/ipfire/manual/mod/mod_dir.html.en
+#srv/web/ipfire/manual/mod/mod_dir.html.fr
 #srv/web/ipfire/manual/mod/mod_dir.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_dir.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_dir.html.tr.utf8
-#srv/web/ipfire/manual/mod/mod_disk_cache.html
-#srv/web/ipfire/manual/mod/mod_disk_cache.html.en
-#srv/web/ipfire/manual/mod/mod_disk_cache.html.ja.utf8
-#srv/web/ipfire/manual/mod/mod_disk_cache.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_dumpio.html
 #srv/web/ipfire/manual/mod/mod_dumpio.html.en
+#srv/web/ipfire/manual/mod/mod_dumpio.html.fr
 #srv/web/ipfire/manual/mod/mod_dumpio.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_echo.html
 #srv/web/ipfire/manual/mod/mod_echo.html.en
+#srv/web/ipfire/manual/mod/mod_echo.html.fr
 #srv/web/ipfire/manual/mod/mod_echo.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_echo.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_env.html
 #srv/web/ipfire/manual/mod/mod_env.html.en
+#srv/web/ipfire/manual/mod/mod_env.html.fr
 #srv/web/ipfire/manual/mod/mod_env.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_env.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_env.html.tr.utf8
-#srv/web/ipfire/manual/mod/mod_example.html
-#srv/web/ipfire/manual/mod/mod_example.html.en
-#srv/web/ipfire/manual/mod/mod_example.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_example_hooks.html
+#srv/web/ipfire/manual/mod/mod_example_hooks.html.en
+#srv/web/ipfire/manual/mod/mod_example_hooks.html.fr
+#srv/web/ipfire/manual/mod/mod_example_hooks.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_expires.html
 #srv/web/ipfire/manual/mod/mod_expires.html.en
+#srv/web/ipfire/manual/mod/mod_expires.html.fr
 #srv/web/ipfire/manual/mod/mod_expires.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_expires.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_ext_filter.html
 #srv/web/ipfire/manual/mod/mod_ext_filter.html.en
+#srv/web/ipfire/manual/mod/mod_ext_filter.html.fr
 #srv/web/ipfire/manual/mod/mod_ext_filter.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_ext_filter.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_file_cache.html
 #srv/web/ipfire/manual/mod/mod_file_cache.html.en
+#srv/web/ipfire/manual/mod/mod_file_cache.html.fr
 #srv/web/ipfire/manual/mod/mod_file_cache.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_filter.html
 #srv/web/ipfire/manual/mod/mod_filter.html.en
+#srv/web/ipfire/manual/mod/mod_filter.html.fr
 #srv/web/ipfire/manual/mod/mod_headers.html
 #srv/web/ipfire/manual/mod/mod_headers.html.en
+#srv/web/ipfire/manual/mod/mod_headers.html.fr
 #srv/web/ipfire/manual/mod/mod_headers.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_headers.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_heartbeat.html
+#srv/web/ipfire/manual/mod/mod_heartbeat.html.en
+#srv/web/ipfire/manual/mod/mod_heartbeat.html.fr
+#srv/web/ipfire/manual/mod/mod_heartmonitor.html
+#srv/web/ipfire/manual/mod/mod_heartmonitor.html.en
+#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_ident.html
 #srv/web/ipfire/manual/mod/mod_ident.html.en
+#srv/web/ipfire/manual/mod/mod_ident.html.fr
 #srv/web/ipfire/manual/mod/mod_ident.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_ident.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_imagemap.html
 #srv/web/ipfire/manual/mod/mod_imagemap.html.en
+#srv/web/ipfire/manual/mod/mod_imagemap.html.fr
 #srv/web/ipfire/manual/mod/mod_imagemap.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_include.html
 #srv/web/ipfire/manual/mod/mod_include.html.en
+#srv/web/ipfire/manual/mod/mod_include.html.fr
 #srv/web/ipfire/manual/mod/mod_include.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_info.html
 #srv/web/ipfire/manual/mod/mod_info.html.en
+#srv/web/ipfire/manual/mod/mod_info.html.fr
 #srv/web/ipfire/manual/mod/mod_info.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_info.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_isapi.html
 #srv/web/ipfire/manual/mod/mod_isapi.html.en
+#srv/web/ipfire/manual/mod/mod_isapi.html.fr
 #srv/web/ipfire/manual/mod/mod_isapi.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_lbmethod_bybusyness.html
+#srv/web/ipfire/manual/mod/mod_lbmethod_bybusyness.html.en
+#srv/web/ipfire/manual/mod/mod_lbmethod_bybusyness.html.fr
+#srv/web/ipfire/manual/mod/mod_lbmethod_byrequests.html
+#srv/web/ipfire/manual/mod/mod_lbmethod_byrequests.html.en
+#srv/web/ipfire/manual/mod/mod_lbmethod_byrequests.html.fr
+#srv/web/ipfire/manual/mod/mod_lbmethod_bytraffic.html
+#srv/web/ipfire/manual/mod/mod_lbmethod_bytraffic.html.en
+#srv/web/ipfire/manual/mod/mod_lbmethod_bytraffic.html.fr
+#srv/web/ipfire/manual/mod/mod_lbmethod_heartbeat.html
+#srv/web/ipfire/manual/mod/mod_lbmethod_heartbeat.html.en
+#srv/web/ipfire/manual/mod/mod_lbmethod_heartbeat.html.fr
 #srv/web/ipfire/manual/mod/mod_ldap.html
 #srv/web/ipfire/manual/mod/mod_ldap.html.en
+#srv/web/ipfire/manual/mod/mod_ldap.html.fr
 #srv/web/ipfire/manual/mod/mod_log_config.html
 #srv/web/ipfire/manual/mod/mod_log_config.html.en
+#srv/web/ipfire/manual/mod/mod_log_config.html.fr
 #srv/web/ipfire/manual/mod/mod_log_config.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_log_config.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_log_config.html.tr.utf8
+#srv/web/ipfire/manual/mod/mod_log_debug.html
+#srv/web/ipfire/manual/mod/mod_log_debug.html.en
+#srv/web/ipfire/manual/mod/mod_log_debug.html.fr
 #srv/web/ipfire/manual/mod/mod_log_forensic.html
 #srv/web/ipfire/manual/mod/mod_log_forensic.html.en
+#srv/web/ipfire/manual/mod/mod_log_forensic.html.fr
 #srv/web/ipfire/manual/mod/mod_log_forensic.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_log_forensic.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_logio.html
 #srv/web/ipfire/manual/mod/mod_logio.html.en
+#srv/web/ipfire/manual/mod/mod_logio.html.fr
 #srv/web/ipfire/manual/mod/mod_logio.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_logio.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_logio.html.tr.utf8
-#srv/web/ipfire/manual/mod/mod_mem_cache.html
-#srv/web/ipfire/manual/mod/mod_mem_cache.html.en
-#srv/web/ipfire/manual/mod/mod_mem_cache.html.ja.utf8
-#srv/web/ipfire/manual/mod/mod_mem_cache.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_lua.html
+#srv/web/ipfire/manual/mod/mod_lua.html.en
+#srv/web/ipfire/manual/mod/mod_lua.html.fr
+#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_mime.html
 #srv/web/ipfire/manual/mod/mod_mime.html.en
+#srv/web/ipfire/manual/mod/mod_mime.html.fr
 #srv/web/ipfire/manual/mod/mod_mime.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_mime_magic.html
 #srv/web/ipfire/manual/mod/mod_mime_magic.html.en
+#srv/web/ipfire/manual/mod/mod_mime_magic.html.fr
 #srv/web/ipfire/manual/mod/mod_negotiation.html
 #srv/web/ipfire/manual/mod/mod_negotiation.html.en
+#srv/web/ipfire/manual/mod/mod_negotiation.html.fr
 #srv/web/ipfire/manual/mod/mod_negotiation.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_nw_ssl.html
 #srv/web/ipfire/manual/mod/mod_nw_ssl.html.en
+#srv/web/ipfire/manual/mod/mod_nw_ssl.html.fr
+#srv/web/ipfire/manual/mod/mod_privileges.html
+#srv/web/ipfire/manual/mod/mod_privileges.html.en
+#srv/web/ipfire/manual/mod/mod_privileges.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy.html
 #srv/web/ipfire/manual/mod/mod_proxy.html.en
 #srv/web/ipfire/manual/mod/mod_proxy.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_ajp.html
 #srv/web/ipfire/manual/mod/mod_proxy_ajp.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_ajp.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy_ajp.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_balancer.html
 #srv/web/ipfire/manual/mod/mod_proxy_balancer.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_balancer.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy_balancer.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_connect.html
 #srv/web/ipfire/manual/mod/mod_proxy_connect.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_connect.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy_connect.html.ja.utf8
+#srv/web/ipfire/manual/mod/mod_proxy_express.html
+#srv/web/ipfire/manual/mod/mod_proxy_express.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_express.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_fcgi.html
+#srv/web/ipfire/manual/mod/mod_proxy_fcgi.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_fcgi.html.fr
+#srv/web/ipfire/manual/mod/mod_proxy_fdpass.html
+#srv/web/ipfire/manual/mod/mod_proxy_fdpass.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_fdpass.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy_ftp.html
 #srv/web/ipfire/manual/mod/mod_proxy_ftp.html.en
-#srv/web/ipfire/manual/mod/mod_proxy_ftp.html.ja.utf8
+#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_html.html
+#srv/web/ipfire/manual/mod/mod_proxy_html.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_html.html.fr
 #srv/web/ipfire/manual/mod/mod_proxy_http.html
 #srv/web/ipfire/manual/mod/mod_proxy_http.html.en
 #srv/web/ipfire/manual/mod/mod_proxy_http.html.fr
-#srv/web/ipfire/manual/mod/mod_proxy_http.html.ja.utf8
+#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_scgi.html
 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.en
-#srv/web/ipfire/manual/mod/mod_proxy_scgi.html.ja.utf8
+#srv/web/ipfire/manual/mod/mod_proxy_scgi.html.fr
+#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
+#srv/web/ipfire/manual/mod/mod_ratelimit.html.en
+#srv/web/ipfire/manual/mod/mod_ratelimit.html.fr
+#srv/web/ipfire/manual/mod/mod_reflector.html
+#srv/web/ipfire/manual/mod/mod_reflector.html.en
+#srv/web/ipfire/manual/mod/mod_reflector.html.fr
+#srv/web/ipfire/manual/mod/mod_remoteip.html
+#srv/web/ipfire/manual/mod/mod_remoteip.html.en
+#srv/web/ipfire/manual/mod/mod_remoteip.html.fr
 #srv/web/ipfire/manual/mod/mod_reqtimeout.html
 #srv/web/ipfire/manual/mod/mod_reqtimeout.html.en
+#srv/web/ipfire/manual/mod/mod_reqtimeout.html.fr
+#srv/web/ipfire/manual/mod/mod_request.html
+#srv/web/ipfire/manual/mod/mod_request.html.en
+#srv/web/ipfire/manual/mod/mod_request.html.fr
+#srv/web/ipfire/manual/mod/mod_request.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_rewrite.html
 #srv/web/ipfire/manual/mod/mod_rewrite.html.en
 #srv/web/ipfire/manual/mod/mod_rewrite.html.fr
+#srv/web/ipfire/manual/mod/mod_sed.html
+#srv/web/ipfire/manual/mod/mod_sed.html.en
+#srv/web/ipfire/manual/mod/mod_sed.html.fr
+#srv/web/ipfire/manual/mod/mod_session.html
+#srv/web/ipfire/manual/mod/mod_session.html.en
+#srv/web/ipfire/manual/mod/mod_session.html.fr
+#srv/web/ipfire/manual/mod/mod_session_cookie.html
+#srv/web/ipfire/manual/mod/mod_session_cookie.html.en
+#srv/web/ipfire/manual/mod/mod_session_cookie.html.fr
+#srv/web/ipfire/manual/mod/mod_session_crypto.html
+#srv/web/ipfire/manual/mod/mod_session_crypto.html.en
+#srv/web/ipfire/manual/mod/mod_session_crypto.html.fr
+#srv/web/ipfire/manual/mod/mod_session_dbd.html
+#srv/web/ipfire/manual/mod/mod_session_dbd.html.en
+#srv/web/ipfire/manual/mod/mod_session_dbd.html.fr
 #srv/web/ipfire/manual/mod/mod_setenvif.html
 #srv/web/ipfire/manual/mod/mod_setenvif.html.en
+#srv/web/ipfire/manual/mod/mod_setenvif.html.fr
 #srv/web/ipfire/manual/mod/mod_setenvif.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_setenvif.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_setenvif.html.tr.utf8
+#srv/web/ipfire/manual/mod/mod_slotmem_plain.html
+#srv/web/ipfire/manual/mod/mod_slotmem_plain.html.en
+#srv/web/ipfire/manual/mod/mod_slotmem_plain.html.fr
+#srv/web/ipfire/manual/mod/mod_slotmem_shm.html
+#srv/web/ipfire/manual/mod/mod_slotmem_shm.html.en
+#srv/web/ipfire/manual/mod/mod_slotmem_shm.html.fr
 #srv/web/ipfire/manual/mod/mod_so.html
 #srv/web/ipfire/manual/mod/mod_so.html.en
+#srv/web/ipfire/manual/mod/mod_so.html.fr
 #srv/web/ipfire/manual/mod/mod_so.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_so.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_so.html.tr.utf8
+#srv/web/ipfire/manual/mod/mod_socache_dbm.html
+#srv/web/ipfire/manual/mod/mod_socache_dbm.html.en
+#srv/web/ipfire/manual/mod/mod_socache_dbm.html.fr
+#srv/web/ipfire/manual/mod/mod_socache_dc.html
+#srv/web/ipfire/manual/mod/mod_socache_dc.html.en
+#srv/web/ipfire/manual/mod/mod_socache_dc.html.fr
+#srv/web/ipfire/manual/mod/mod_socache_memcache.html
+#srv/web/ipfire/manual/mod/mod_socache_memcache.html.en
+#srv/web/ipfire/manual/mod/mod_socache_memcache.html.fr
+#srv/web/ipfire/manual/mod/mod_socache_shmcb.html
+#srv/web/ipfire/manual/mod/mod_socache_shmcb.html.en
+#srv/web/ipfire/manual/mod/mod_socache_shmcb.html.fr
 #srv/web/ipfire/manual/mod/mod_speling.html
 #srv/web/ipfire/manual/mod/mod_speling.html.en
+#srv/web/ipfire/manual/mod/mod_speling.html.fr
 #srv/web/ipfire/manual/mod/mod_speling.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_speling.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_ssl.html
 #srv/web/ipfire/manual/mod/mod_ssl.html.en
+#srv/web/ipfire/manual/mod/mod_ssl.html.fr
 #srv/web/ipfire/manual/mod/mod_status.html
 #srv/web/ipfire/manual/mod/mod_status.html.en
+#srv/web/ipfire/manual/mod/mod_status.html.fr
 #srv/web/ipfire/manual/mod/mod_status.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_status.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_status.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_substitute.html
 #srv/web/ipfire/manual/mod/mod_substitute.html.en
+#srv/web/ipfire/manual/mod/mod_substitute.html.fr
 #srv/web/ipfire/manual/mod/mod_suexec.html
 #srv/web/ipfire/manual/mod/mod_suexec.html.en
 #srv/web/ipfire/manual/mod/mod_suexec.html.fr
@@ -822,57 +1060,77 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #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.fr
 #srv/web/ipfire/manual/mod/mod_unique_id.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_unique_id.html.ko.euc-kr
+#srv/web/ipfire/manual/mod/mod_unixd.html
+#srv/web/ipfire/manual/mod/mod_unixd.html.en
+#srv/web/ipfire/manual/mod/mod_unixd.html.fr
+#srv/web/ipfire/manual/mod/mod_unixd.html.tr.utf8
 #srv/web/ipfire/manual/mod/mod_userdir.html
 #srv/web/ipfire/manual/mod/mod_userdir.html.en
+#srv/web/ipfire/manual/mod/mod_userdir.html.fr
 #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_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.ja.utf8
 #srv/web/ipfire/manual/mod/mod_version.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_vhost_alias.html
 #srv/web/ipfire/manual/mod/mod_vhost_alias.html.en
+#srv/web/ipfire/manual/mod/mod_vhost_alias.html.fr
 #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_xml2enc.html
+#srv/web/ipfire/manual/mod/mod_xml2enc.html.en
+#srv/web/ipfire/manual/mod/mod_xml2enc.html.fr
 #srv/web/ipfire/manual/mod/module-dict.html
 #srv/web/ipfire/manual/mod/module-dict.html.en
+#srv/web/ipfire/manual/mod/module-dict.html.fr
 #srv/web/ipfire/manual/mod/module-dict.html.ja.utf8
 #srv/web/ipfire/manual/mod/module-dict.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/module-dict.html.tr.utf8
 #srv/web/ipfire/manual/mod/mpm_common.html
 #srv/web/ipfire/manual/mod/mpm_common.html.de
 #srv/web/ipfire/manual/mod/mpm_common.html.en
+#srv/web/ipfire/manual/mod/mpm_common.html.fr
 #srv/web/ipfire/manual/mod/mpm_common.html.ja.utf8
 #srv/web/ipfire/manual/mod/mpm_common.html.tr.utf8
 #srv/web/ipfire/manual/mod/mpm_netware.html
 #srv/web/ipfire/manual/mod/mpm_netware.html.en
+#srv/web/ipfire/manual/mod/mpm_netware.html.fr
 #srv/web/ipfire/manual/mod/mpm_winnt.html
 #srv/web/ipfire/manual/mod/mpm_winnt.html.de
 #srv/web/ipfire/manual/mod/mpm_winnt.html.en
+#srv/web/ipfire/manual/mod/mpm_winnt.html.fr
 #srv/web/ipfire/manual/mod/mpm_winnt.html.ja.utf8
 #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/prefork.html
 #srv/web/ipfire/manual/mod/prefork.html.de
 #srv/web/ipfire/manual/mod/prefork.html.en
+#srv/web/ipfire/manual/mod/prefork.html.fr
 #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
 #srv/web/ipfire/manual/mod/quickreference.html.es
+#srv/web/ipfire/manual/mod/quickreference.html.fr
 #srv/web/ipfire/manual/mod/quickreference.html.ja.utf8
 #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.utf8
 #srv/web/ipfire/manual/mod/worker.html
 #srv/web/ipfire/manual/mod/worker.html.de
 #srv/web/ipfire/manual/mod/worker.html.en
+#srv/web/ipfire/manual/mod/worker.html.fr
 #srv/web/ipfire/manual/mod/worker.html.ja.utf8
 #srv/web/ipfire/manual/mod/worker.html.tr.utf8
 #srv/web/ipfire/manual/mpm.html
@@ -896,93 +1154,124 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/new_features_2_2.html
 #srv/web/ipfire/manual/new_features_2_2.html.en
 #srv/web/ipfire/manual/new_features_2_2.html.fr
-#srv/web/ipfire/manual/new_features_2_2.html.ja.utf8
 #srv/web/ipfire/manual/new_features_2_2.html.ko.euc-kr
 #srv/web/ipfire/manual/new_features_2_2.html.pt-br
 #srv/web/ipfire/manual/new_features_2_2.html.tr.utf8
+#srv/web/ipfire/manual/new_features_2_4.html
+#srv/web/ipfire/manual/new_features_2_4.html.en
+#srv/web/ipfire/manual/new_features_2_4.html.fr
+#srv/web/ipfire/manual/new_features_2_4.html.tr.utf8
 #srv/web/ipfire/manual/platform
 #srv/web/ipfire/manual/platform/ebcdic.html
 #srv/web/ipfire/manual/platform/ebcdic.html.en
 #srv/web/ipfire/manual/platform/ebcdic.html.ko.euc-kr
 #srv/web/ipfire/manual/platform/index.html
 #srv/web/ipfire/manual/platform/index.html.en
+#srv/web/ipfire/manual/platform/index.html.fr
 #srv/web/ipfire/manual/platform/index.html.ko.euc-kr
 #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.fr
 #srv/web/ipfire/manual/platform/netware.html.ko.euc-kr
 #srv/web/ipfire/manual/platform/perf-hp.html
 #srv/web/ipfire/manual/platform/perf-hp.html.en
+#srv/web/ipfire/manual/platform/perf-hp.html.fr
 #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/win_compiling.html
 #srv/web/ipfire/manual/platform/win_compiling.html.en
+#srv/web/ipfire/manual/platform/win_compiling.html.fr
 #srv/web/ipfire/manual/platform/win_compiling.html.ko.euc-kr
 #srv/web/ipfire/manual/platform/windows.html
 #srv/web/ipfire/manual/platform/windows.html.en
+#srv/web/ipfire/manual/platform/windows.html.fr
 #srv/web/ipfire/manual/platform/windows.html.ko.euc-kr
 #srv/web/ipfire/manual/programs
 #srv/web/ipfire/manual/programs/ab.html
 #srv/web/ipfire/manual/programs/ab.html.en
+#srv/web/ipfire/manual/programs/ab.html.fr
 #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.fr
 #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.fr
 #srv/web/ipfire/manual/programs/apxs.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/apxs.html.tr.utf8
 #srv/web/ipfire/manual/programs/configure.html
 #srv/web/ipfire/manual/programs/configure.html.en
+#srv/web/ipfire/manual/programs/configure.html.fr
 #srv/web/ipfire/manual/programs/configure.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/configure.html.tr.utf8
 #srv/web/ipfire/manual/programs/dbmmanage.html
 #srv/web/ipfire/manual/programs/dbmmanage.html.en
+#srv/web/ipfire/manual/programs/dbmmanage.html.fr
 #srv/web/ipfire/manual/programs/dbmmanage.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/dbmmanage.html.tr.utf8
+#srv/web/ipfire/manual/programs/fcgistarter.html
+#srv/web/ipfire/manual/programs/fcgistarter.html.en
+#srv/web/ipfire/manual/programs/fcgistarter.html.fr
+#srv/web/ipfire/manual/programs/fcgistarter.html.tr.utf8
 #srv/web/ipfire/manual/programs/htcacheclean.html
 #srv/web/ipfire/manual/programs/htcacheclean.html.en
+#srv/web/ipfire/manual/programs/htcacheclean.html.fr
 #srv/web/ipfire/manual/programs/htcacheclean.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/htcacheclean.html.tr.utf8
 #srv/web/ipfire/manual/programs/htdbm.html
 #srv/web/ipfire/manual/programs/htdbm.html.en
+#srv/web/ipfire/manual/programs/htdbm.html.fr
 #srv/web/ipfire/manual/programs/htdbm.html.tr.utf8
 #srv/web/ipfire/manual/programs/htdigest.html
 #srv/web/ipfire/manual/programs/htdigest.html.en
+#srv/web/ipfire/manual/programs/htdigest.html.fr
 #srv/web/ipfire/manual/programs/htdigest.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/htdigest.html.tr.utf8
 #srv/web/ipfire/manual/programs/htpasswd.html
 #srv/web/ipfire/manual/programs/htpasswd.html.en
+#srv/web/ipfire/manual/programs/htpasswd.html.fr
 #srv/web/ipfire/manual/programs/htpasswd.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/htpasswd.html.tr.utf8
 #srv/web/ipfire/manual/programs/httpd.html
 #srv/web/ipfire/manual/programs/httpd.html.en
+#srv/web/ipfire/manual/programs/httpd.html.fr
 #srv/web/ipfire/manual/programs/httpd.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/httpd.html.tr.utf8
 #srv/web/ipfire/manual/programs/httxt2dbm.html
 #srv/web/ipfire/manual/programs/httxt2dbm.html.en
+#srv/web/ipfire/manual/programs/httxt2dbm.html.fr
 #srv/web/ipfire/manual/programs/httxt2dbm.html.tr.utf8
 #srv/web/ipfire/manual/programs/index.html
 #srv/web/ipfire/manual/programs/index.html.en
 #srv/web/ipfire/manual/programs/index.html.es
-#srv/web/ipfire/manual/programs/index.html.ja.utf8
+#srv/web/ipfire/manual/programs/index.html.fr
 #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.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/logresolve.html
 #srv/web/ipfire/manual/programs/logresolve.html.en
+#srv/web/ipfire/manual/programs/logresolve.html.fr
 #srv/web/ipfire/manual/programs/logresolve.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/logresolve.html.tr.utf8
 #srv/web/ipfire/manual/programs/other.html
 #srv/web/ipfire/manual/programs/other.html.en
+#srv/web/ipfire/manual/programs/other.html.fr
 #srv/web/ipfire/manual/programs/other.html.ko.euc-kr
 #srv/web/ipfire/manual/programs/other.html.tr.utf8
 #srv/web/ipfire/manual/programs/rotatelogs.html
 #srv/web/ipfire/manual/programs/rotatelogs.html.en
+#srv/web/ipfire/manual/programs/rotatelogs.html.fr
 #srv/web/ipfire/manual/programs/rotatelogs.html.ko.euc-kr
 #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/suexec.html
 #srv/web/ipfire/manual/programs/suexec.html.en
 #srv/web/ipfire/manual/programs/suexec.html.ko.euc-kr
@@ -990,15 +1279,19 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/rewrite
 #srv/web/ipfire/manual/rewrite/access.html
 #srv/web/ipfire/manual/rewrite/access.html.en
+#srv/web/ipfire/manual/rewrite/access.html.fr
 #srv/web/ipfire/manual/rewrite/advanced.html
 #srv/web/ipfire/manual/rewrite/advanced.html.en
+#srv/web/ipfire/manual/rewrite/advanced.html.fr
 #srv/web/ipfire/manual/rewrite/avoid.html
 #srv/web/ipfire/manual/rewrite/avoid.html.en
+#srv/web/ipfire/manual/rewrite/avoid.html.fr
 #srv/web/ipfire/manual/rewrite/flags.html
 #srv/web/ipfire/manual/rewrite/flags.html.en
 #srv/web/ipfire/manual/rewrite/flags.html.fr
 #srv/web/ipfire/manual/rewrite/htaccess.html
 #srv/web/ipfire/manual/rewrite/htaccess.html.en
+#srv/web/ipfire/manual/rewrite/htaccess.html.fr
 #srv/web/ipfire/manual/rewrite/index.html
 #srv/web/ipfire/manual/rewrite/index.html.en
 #srv/web/ipfire/manual/rewrite/index.html.fr
@@ -1009,15 +1302,19 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/rewrite/intro.html.fr
 #srv/web/ipfire/manual/rewrite/proxy.html
 #srv/web/ipfire/manual/rewrite/proxy.html.en
+#srv/web/ipfire/manual/rewrite/proxy.html.fr
 #srv/web/ipfire/manual/rewrite/remapping.html
 #srv/web/ipfire/manual/rewrite/remapping.html.en
+#srv/web/ipfire/manual/rewrite/remapping.html.fr
 #srv/web/ipfire/manual/rewrite/rewritemap.html
 #srv/web/ipfire/manual/rewrite/rewritemap.html.en
+#srv/web/ipfire/manual/rewrite/rewritemap.html.fr
 #srv/web/ipfire/manual/rewrite/tech.html
 #srv/web/ipfire/manual/rewrite/tech.html.en
 #srv/web/ipfire/manual/rewrite/tech.html.fr
 #srv/web/ipfire/manual/rewrite/vhosts.html
 #srv/web/ipfire/manual/rewrite/vhosts.html.en
+#srv/web/ipfire/manual/rewrite/vhosts.html.fr
 #srv/web/ipfire/manual/sections.html
 #srv/web/ipfire/manual/sections.html.en
 #srv/web/ipfire/manual/sections.html.fr
@@ -1026,6 +1323,7 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/sections.html.tr.utf8
 #srv/web/ipfire/manual/server-wide.html
 #srv/web/ipfire/manual/server-wide.html.en
+#srv/web/ipfire/manual/server-wide.html.fr
 #srv/web/ipfire/manual/server-wide.html.ja.utf8
 #srv/web/ipfire/manual/server-wide.html.ko.euc-kr
 #srv/web/ipfire/manual/server-wide.html.tr.utf8
@@ -1033,24 +1331,33 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/sitemap.html.de
 #srv/web/ipfire/manual/sitemap.html.en
 #srv/web/ipfire/manual/sitemap.html.es
+#srv/web/ipfire/manual/sitemap.html.fr
 #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.utf8
+#srv/web/ipfire/manual/socache.html
+#srv/web/ipfire/manual/socache.html.en
+#srv/web/ipfire/manual/socache.html.fr
 #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.fr
 #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.utf8
 #srv/web/ipfire/manual/ssl/ssl_compat.html
 #srv/web/ipfire/manual/ssl/ssl_compat.html.en
+#srv/web/ipfire/manual/ssl/ssl_compat.html.fr
 #srv/web/ipfire/manual/ssl/ssl_faq.html
 #srv/web/ipfire/manual/ssl/ssl_faq.html.en
+#srv/web/ipfire/manual/ssl/ssl_faq.html.fr
 #srv/web/ipfire/manual/ssl/ssl_howto.html
 #srv/web/ipfire/manual/ssl/ssl_howto.html.en
+#srv/web/ipfire/manual/ssl/ssl_howto.html.fr
 #srv/web/ipfire/manual/ssl/ssl_intro.html
 #srv/web/ipfire/manual/ssl/ssl_intro.html.en
+#srv/web/ipfire/manual/ssl/ssl_intro.html.fr
 #srv/web/ipfire/manual/ssl/ssl_intro.html.ja.utf8
 #srv/web/ipfire/manual/stopping.html
 #srv/web/ipfire/manual/stopping.html.de
@@ -1093,12 +1400,11 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #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
 #srv/web/ipfire/manual/upgrading.html.fr
-#srv/web/ipfire/manual/upgrading.html.ja.utf8
 #srv/web/ipfire/manual/urlmapping.html
 #srv/web/ipfire/manual/urlmapping.html.en
+#srv/web/ipfire/manual/urlmapping.html.fr
 #srv/web/ipfire/manual/urlmapping.html.ja.utf8
 #srv/web/ipfire/manual/urlmapping.html.ko.euc-kr
 #srv/web/ipfire/manual/urlmapping.html.tr.utf8
@@ -1126,7 +1432,6 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/vhosts/index.html.fr
 #srv/web/ipfire/manual/vhosts/index.html.ja.utf8
 #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.utf8
 #srv/web/ipfire/manual/vhosts/ip-based.html
@@ -1137,6 +1442,7 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/vhosts/ip-based.html.tr.utf8
 #srv/web/ipfire/manual/vhosts/mass.html
 #srv/web/ipfire/manual/vhosts/mass.html.en
+#srv/web/ipfire/manual/vhosts/mass.html.fr
 #srv/web/ipfire/manual/vhosts/mass.html.ko.euc-kr
 #srv/web/ipfire/manual/vhosts/mass.html.tr.utf8
 #srv/web/ipfire/manual/vhosts/name-based.html
@@ -1146,13 +1452,21 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #srv/web/ipfire/manual/vhosts/name-based.html.ja.utf8
 #srv/web/ipfire/manual/vhosts/name-based.html.ko.euc-kr
 #srv/web/ipfire/manual/vhosts/name-based.html.tr.utf8
-#usr/bin/apr-1-config
-#usr/bin/apu-1-config
+#usr/bin/ab
+#usr/bin/apxs
+#usr/bin/dbmmanage
+#usr/bin/htdbm
+#usr/bin/htdigest
+usr/bin/htpasswd
+#usr/bin/httxt2dbm
+#usr/bin/logresolve
 #usr/include/apache
 #usr/include/apache/ap_compat.h
 #usr/include/apache/ap_config.h
 #usr/include/apache/ap_config_auto.h
 #usr/include/apache/ap_config_layout.h
+#usr/include/apache/ap_expr.h
+#usr/include/apache/ap_hooks.h
 #usr/include/apache/ap_listen.h
 #usr/include/apache/ap_mmn.h
 #usr/include/apache/ap_mpm.h
@@ -1160,77 +1474,11 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #usr/include/apache/ap_regex.h
 #usr/include/apache/ap_regkey.h
 #usr/include/apache/ap_release.h
-#usr/include/apache/apr.h
-#usr/include/apache/apr_allocator.h
-#usr/include/apache/apr_anylock.h
-#usr/include/apache/apr_atomic.h
-#usr/include/apache/apr_base64.h
-#usr/include/apache/apr_buckets.h
-#usr/include/apache/apr_crypto.h
-#usr/include/apache/apr_date.h
-#usr/include/apache/apr_dbd.h
-#usr/include/apache/apr_dbm.h
-#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
-#usr/include/apache/apr_general.h
-#usr/include/apache/apr_getopt.h
-#usr/include/apache/apr_global_mutex.h
-#usr/include/apache/apr_hash.h
-#usr/include/apache/apr_hooks.h
-#usr/include/apache/apr_inherit.h
-#usr/include/apache/apr_ldap.h
-#usr/include/apache/apr_ldap_init.h
-#usr/include/apache/apr_ldap_option.h
-#usr/include/apache/apr_ldap_rebind.h
-#usr/include/apache/apr_ldap_url.h
-#usr/include/apache/apr_lib.h
-#usr/include/apache/apr_md4.h
-#usr/include/apache/apr_md5.h
-#usr/include/apache/apr_memcache.h
-#usr/include/apache/apr_mmap.h
-#usr/include/apache/apr_network_io.h
-#usr/include/apache/apr_optional.h
-#usr/include/apache/apr_optional_hooks.h
-#usr/include/apache/apr_poll.h
-#usr/include/apache/apr_pools.h
-#usr/include/apache/apr_portable.h
-#usr/include/apache/apr_proc_mutex.h
-#usr/include/apache/apr_queue.h
-#usr/include/apache/apr_random.h
-#usr/include/apache/apr_reslist.h
-#usr/include/apache/apr_ring.h
-#usr/include/apache/apr_rmm.h
-#usr/include/apache/apr_sdbm.h
-#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
-#usr/include/apache/apr_tables.h
-#usr/include/apache/apr_thread_cond.h
-#usr/include/apache/apr_thread_mutex.h
-#usr/include/apache/apr_thread_pool.h
-#usr/include/apache/apr_thread_proc.h
-#usr/include/apache/apr_thread_rwlock.h
-#usr/include/apache/apr_time.h
-#usr/include/apache/apr_uri.h
-#usr/include/apache/apr_user.h
-#usr/include/apache/apr_uuid.h
-#usr/include/apache/apr_version.h
-#usr/include/apache/apr_want.h
-#usr/include/apache/apr_xlate.h
-#usr/include/apache/apr_xml.h
-#usr/include/apache/apu.h
-#usr/include/apache/apu_errno.h
-#usr/include/apache/apu_version.h
-#usr/include/apache/apu_want.h
+#usr/include/apache/ap_slotmem.h
+#usr/include/apache/ap_socache.h
+#usr/include/apache/apache_noprobes.h
+#usr/include/apache/cache_common.h
+#usr/include/apache/heartbeat.h
 #usr/include/apache/http_config.h
 #usr/include/apache/http_connection.h
 #usr/include/apache/http_core.h
@@ -1241,6 +1489,7 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #usr/include/apache/http_vhost.h
 #usr/include/apache/httpd.h
 #usr/include/apache/mod_auth.h
+#usr/include/apache/mod_cache.h
 #usr/include/apache/mod_cgi.h
 #usr/include/apache/mod_core.h
 #usr/include/apache/mod_dav.h
@@ -1248,77 +1497,102 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
 #usr/include/apache/mod_include.h
 #usr/include/apache/mod_log_config.h
 #usr/include/apache/mod_proxy.h
+#usr/include/apache/mod_request.h
 #usr/include/apache/mod_rewrite.h
+#usr/include/apache/mod_session.h
+#usr/include/apache/mod_so.h
 #usr/include/apache/mod_ssl.h
+#usr/include/apache/mod_ssl_openssl.h
 #usr/include/apache/mod_status.h
-#usr/include/apache/mpm.h
+#usr/include/apache/mod_unixd.h
+#usr/include/apache/mod_watchdog.h
+#usr/include/apache/mod_xml2enc.h
 #usr/include/apache/mpm_common.h
-#usr/include/apache/mpm_default.h
 #usr/include/apache/os.h
 #usr/include/apache/scoreboard.h
 #usr/include/apache/unixd.h
 #usr/include/apache/util_cfgtree.h
 #usr/include/apache/util_charset.h
+#usr/include/apache/util_cookies.h
 #usr/include/apache/util_ebcdic.h
+#usr/include/apache/util_fcgi.h
 #usr/include/apache/util_filter.h
 #usr/include/apache/util_ldap.h
 #usr/include/apache/util_md5.h
+#usr/include/apache/util_mutex.h
 #usr/include/apache/util_script.h
 #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/apr_rules.mk
 #usr/lib/apache/build/config.nice
 #usr/lib/apache/build/config_vars.mk
 #usr/lib/apache/build/instdso.sh
 #usr/lib/apache/build/library.mk
-#usr/lib/apache/build/libtool
 #usr/lib/apache/build/ltlib.mk
-#usr/lib/apache/build/make_exports.awk
-#usr/lib/apache/build/make_var_export.awk
 #usr/lib/apache/build/mkdir.sh
 #usr/lib/apache/build/program.mk
 #usr/lib/apache/build/rules.mk
 #usr/lib/apache/build/special.mk
 #usr/lib/apache/httpd.exp
+#usr/lib/apache/mod_access_compat.so
 usr/lib/apache/mod_actions.so
 usr/lib/apache/mod_alias.so
+usr/lib/apache/mod_allowmethods.so
 usr/lib/apache/mod_asis.so
 usr/lib/apache/mod_auth_basic.so
 usr/lib/apache/mod_auth_digest.so
+usr/lib/apache/mod_auth_form.so
 usr/lib/apache/mod_authn_anon.so
+usr/lib/apache/mod_authn_core.so
 usr/lib/apache/mod_authn_dbd.so
 usr/lib/apache/mod_authn_dbm.so
-usr/lib/apache/mod_authn_default.so
 usr/lib/apache/mod_authn_file.so
+usr/lib/apache/mod_authn_socache.so
+usr/lib/apache/mod_authz_core.so
+usr/lib/apache/mod_authz_dbd.so
 usr/lib/apache/mod_authz_dbm.so
-usr/lib/apache/mod_authz_default.so
 usr/lib/apache/mod_authz_groupfile.so
 usr/lib/apache/mod_authz_host.so
 usr/lib/apache/mod_authz_owner.so
 usr/lib/apache/mod_authz_user.so
 usr/lib/apache/mod_autoindex.so
-usr/lib/apache/mod_cern_meta.so
-usr/lib/apache/mod_cgi.so
+usr/lib/apache/mod_buffer.so
+usr/lib/apache/mod_cache.so
+usr/lib/apache/mod_cache_disk.so
+usr/lib/apache/mod_cache_socache.so
+usr/lib/apache/mod_cgid.so
+usr/lib/apache/mod_charset_lite.so
+usr/lib/apache/mod_data.so
 usr/lib/apache/mod_dav.so
 usr/lib/apache/mod_dav_fs.so
+usr/lib/apache/mod_dav_lock.so
 usr/lib/apache/mod_dbd.so
 usr/lib/apache/mod_deflate.so
+usr/lib/apache/mod_dialup.so
 usr/lib/apache/mod_dir.so
 usr/lib/apache/mod_dumpio.so
+usr/lib/apache/mod_echo.so
 usr/lib/apache/mod_env.so
 usr/lib/apache/mod_expires.so
 usr/lib/apache/mod_ext_filter.so
+usr/lib/apache/mod_file_cache.so
 usr/lib/apache/mod_filter.so
 usr/lib/apache/mod_headers.so
-usr/lib/apache/mod_ident.so
-usr/lib/apache/mod_imagemap.so
+usr/lib/apache/mod_heartbeat.so
+usr/lib/apache/mod_heartmonitor.so
 usr/lib/apache/mod_include.so
 usr/lib/apache/mod_info.so
+usr/lib/apache/mod_lbmethod_bybusyness.so
+usr/lib/apache/mod_lbmethod_byrequests.so
+usr/lib/apache/mod_lbmethod_bytraffic.so
+usr/lib/apache/mod_lbmethod_heartbeat.so
 usr/lib/apache/mod_log_config.so
+usr/lib/apache/mod_log_debug.so
 usr/lib/apache/mod_log_forensic.so
 usr/lib/apache/mod_logio.so
+usr/lib/apache/mod_macro.so
 usr/lib/apache/mod_mime.so
 usr/lib/apache/mod_mime_magic.so
 usr/lib/apache/mod_negotiation.so
@@ -1326,49 +1600,65 @@ 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_express.so
+usr/lib/apache/mod_proxy_fcgi.so
+usr/lib/apache/mod_proxy_fdpass.so
 usr/lib/apache/mod_proxy_ftp.so
+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_wstunnel.so
+usr/lib/apache/mod_ratelimit.so
+usr/lib/apache/mod_reflector.so
+usr/lib/apache/mod_remoteip.so
 usr/lib/apache/mod_reqtimeout.so
+usr/lib/apache/mod_request.so
 usr/lib/apache/mod_rewrite.so
+usr/lib/apache/mod_sed.so
+usr/lib/apache/mod_session.so
+usr/lib/apache/mod_session_cookie.so
+usr/lib/apache/mod_session_crypto.so
+usr/lib/apache/mod_session_dbd.so
 usr/lib/apache/mod_setenvif.so
+usr/lib/apache/mod_slotmem_plain.so
+usr/lib/apache/mod_slotmem_shm.so
+usr/lib/apache/mod_socache_dbm.so
+usr/lib/apache/mod_socache_memcache.so
+usr/lib/apache/mod_socache_shmcb.so
 usr/lib/apache/mod_speling.so
 usr/lib/apache/mod_ssl.so
 usr/lib/apache/mod_status.so
 usr/lib/apache/mod_substitute.so
 usr/lib/apache/mod_unique_id.so
+usr/lib/apache/mod_unixd.so
 usr/lib/apache/mod_userdir.so
 usr/lib/apache/mod_usertrack.so
 usr/lib/apache/mod_version.so
 usr/lib/apache/mod_vhost_alias.so
-#usr/lib/pkgconfig/apr-1.pc
-#usr/lib/pkgconfig/apr-util-1.pc
+usr/lib/apache/mod_watchdog.so
+usr/lib/apache/mod_xml2enc.so
 #usr/sbin/ab
 usr/sbin/apachectl
-#usr/sbin/apxs
 #usr/sbin/checkgid
-#usr/sbin/dbmmanage
 #usr/sbin/envvars
 #usr/sbin/envvars-std
+usr/sbin/fcgistarter
 #usr/sbin/htcacheclean
-#usr/sbin/htdbm
-#usr/sbin/htdigest
-usr/sbin/htpasswd
 usr/sbin/httpd
-#usr/sbin/httxt2dbm
-#usr/sbin/logresolve
 #usr/sbin/rotatelogs
+#usr/share/man/man1/ab.1
+#usr/share/man/man1/apxs.1
 #usr/share/man/man1/dbmmanage.1
 #usr/share/man/man1/htdbm.1
 #usr/share/man/man1/htdigest.1
 #usr/share/man/man1/htpasswd.1
 #usr/share/man/man1/httxt2dbm.1
-#usr/share/man/man8/ab.8
+#usr/share/man/man1/logresolve.1
 #usr/share/man/man8/apachectl.8
-#usr/share/man/man8/apxs.8
+#usr/share/man/man8/fcgistarter.8
 #usr/share/man/man8/htcacheclean.8
 #usr/share/man/man8/httpd.8
-#usr/share/man/man8/logresolve.8
 #usr/share/man/man8/rotatelogs.8
 #usr/share/man/man8/suexec.8
 var/log/httpd

diff --git a/config/rootfiles/common/php b/config/rootfiles/common/php
index 23031e96b42053147c78a19f8fac2f736118ed8e..fa073de9da11573dc9ecbe05cd28e5501a5ac8f9 100644 (file)
--- a/config/rootfiles/common/php
+++ b/config/rootfiles/common/php
@@ -522,9 +522,9 @@ usr/lib/php/XML/Util.php
 usr/lib/php/doc/XML_Util/examples/example.php
 usr/lib/php/doc/XML_Util/examples/example2.php
 #usr/lib/php/extensions
-#usr/lib/php/extensions/no-debug-non-zts-20090626
-usr/lib/php/extensions/no-debug-non-zts-20090626/dba.so
-usr/lib/php/extensions/no-debug-non-zts-20090626/idn.so
+#usr/lib/php/extensions/no-debug-zts-20090626
+usr/lib/php/extensions/no-debug-zts-20090626/dba.so
+usr/lib/php/extensions/no-debug-zts-20090626/idn.so
 #usr/lib/php/pearcmd.php
 #usr/lib/php/peclcmd.php
 #usr/lib/php/test
@@ -557,4 +557,3 @@ usr/lib/php/extensions/no-debug-non-zts-20090626/idn.so
 #usr/man/man1/php-config.1
 #usr/man/man1/php.1
 #usr/man/man1/phpize.1
-etc/httpd/conf/conf.d/php5.conf

diff --git a/lfs/apache2 b/lfs/apache2
index 6c71a08cfdf050f3527cb25be10e21e1e54d1ff6..219ef07dd1b4df18503707b2707db35c1a6a832b 100644 (file)
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -25,27 +25,30 @@
 
 include Config
 
-VER        = 2.2.29
+VER        = 2.4.27
 
 THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
+DL_FROM    = https://archive.apache.org/dist/httpd
+
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+DEPS       = "aprutil pcre"
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
 objects = $(DL_FILE) \
-       httpd-2.2.2-config-1.patch
+       PR61382-Fix.patch
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch
+PR61382-Fix.patch = ${DL_FROM}/patches/apply_to_2.4.27/PR61382-Fix.patch
 
-$(DL_FILE)_MD5 = 579342fdeaa7b8b68d17fee91f8fab6e
-httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
+$(DL_FILE)_MD5 = 97b6bbfa83c866dbe20ef317e3afd108
+PR61382-Fix.patch_MD5 = 5c1107bb1f399419574d983ce103c99a
 
 install : $(TARGET)
 
@@ -75,7 +78,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @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
+       cd $(DIR_APP) && patch -Np0 -i $(DIR_DL)/PR61382-Fix.patch
 
        ### Add IPFire's layout, too
        echo "# IPFire layout" >> $(DIR_APP)/config.layout
@@ -103,14 +106,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        echo "</Layout>" >> $(DIR_APP)/config.layout
 
        cd $(DIR_APP) && ./configure --enable-layout=IPFire \
-                               --enable-ssl --enable-mods-shared=all --enable-proxy --with-apr=/usr --with-apr-util=/usr
+                               --enable-ssl --enable-mods-shared=all --enable-proxy --with-mpm=event
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        chown -v root:root /usr/lib/apache/httpd.exp \
-           /usr/sbin/{apxs,apachectl,dbmmanage,envvars{,-std}} \
-           /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
+           /usr/bin/{apxs,dbmmanage} \
+           /usr/sbin/apachectl \
+           /usr/share/man/man1/{ab,apxs,dbmmanage,ht{dbm,digest,passwd,txt2dbm},logresolve}.1 \
+           /usr/share/man/man8/{apachectl,htcacheclean,httpd}.8 \
+           /usr/share/man/man8/{rotatelogs,suexec}.8
 
        # Install apache config
        cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf

diff --git a/src/setup/passwords.c b/src/setup/passwords.c
index e7b4b5231a0343f7c911808aa6f0d6079f191931..6242577af9eb7540cd87ef711f7d952d1304976f 100644 (file)
--- a/src/setup/passwords.c
+++ b/src/setup/passwords.c
@@ -56,7 +56,7 @@ int handleadminpassword(void)
                return 0;
        
        snprintf(commandstring, STRING_SIZE,
-               "/usr/sbin/htpasswd -c -m -b " CONFIG_ROOT "/auth/users admin '%s'", password);
+               "/usr/bin/htpasswd -c -B -C 7 -b " CONFIG_ROOT "/auth/users admin '%s'", password);
        sprintf(message, _("Setting %s 'admin' user password..."), NAME);
        if (runhiddencommandwithstatus(commandstring, _("Setting password"), message, NULL)) {
                sprintf(message, _("Problem setting %s 'admin' user password."), NAME);