Apache updates for Bionic (18.04)

My personal site isn't working right, but Apache as a whole seems mostly okay.

diff --git a/apache2.conf b/apache2.conf
index baf6d8aabcba04801ba7bf524a437ffae6e16e54..ae4b2c33dc54ba217dd9de1b264d3856d28b1d1f 100644 (file)
--- a/apache2.conf
+++ b/apache2.conf
@@ -71,7 +71,13 @@
 #
 # The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
 #
-Mutex file:${APACHE_LOCK_DIR} default
+#Mutex file:${APACHE_LOCK_DIR} default
+
+#
+# The directory where shm and other runtime files will be stored.
+#
+
+DefaultRuntimeDir ${APACHE_RUN_DIR}
 
 #
 # PidFile: The file in which the server should record its process

diff --git a/envvars b/envvars
index 91328ac72ab65c94e76eb4591c70cb60e4b8706e..708d1706969545cf4a4e629216d10fe26cd25b83 100644 (file)
--- a/envvars
+++ b/envvars
@@ -16,7 +16,7 @@ fi
 export APACHE_RUN_USER=www-data
 export APACHE_RUN_GROUP=www-data
 # temporary state file location. This might be changed to /run in Wheezy+1
-export APACHE_PID_FILE=/var/run/apache2/apache2$SUFFIX.pid
+export APACHE_PID_FILE=/var/run/apache2$SUFFIX/apache2.pid
 export APACHE_RUN_DIR=/var/run/apache2$SUFFIX
 export APACHE_LOCK_DIR=/var/lock/apache2$SUFFIX
 # Only /var/log/apache2 is handled by /etc/logrotate.d/apache2.

diff --git a/mods-available/cern_meta.load b/mods-available/cern_meta.load
new file mode 100644 (file)
index 0000000..bcc7546
--- /dev/null
+++ b/mods-available/cern_meta.load
@@ -0,0 +1 @@
+LoadModule cern_meta_module /usr/lib/apache2/modules/mod_cern_meta.so

diff --git a/mods-available/deflate.conf b/mods-available/deflate.conf
index 91d7f332c86ed5665f7cbd0cfcf53e4a754357ec..db48f925fcfac1dc37270dead2d052325cd23b3f 100644 (file)
--- a/mods-available/deflate.conf
+++ b/mods-available/deflate.conf
@@ -1,10 +1,6 @@
 <IfModule mod_deflate.c>
        <IfModule mod_filter.c>
-               # these are known to be safe with MSIE 6
-               AddOutputFilterByType DEFLATE text/html text/plain text/xml
-
-               # everything else may cause problems with MSIE 6
-               AddOutputFilterByType DEFLATE text/css
+               AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
                AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript
                AddOutputFilterByType DEFLATE application/rss+xml
                AddOutputFilterByType DEFLATE application/xml

diff --git a/mods-available/http2.load b/mods-available/http2.load
new file mode 100644 (file)
index 0000000..e5c769f
--- /dev/null
+++ b/mods-available/http2.load
@@ -0,0 +1 @@
+LoadModule http2_module /usr/lib/apache2/modules/mod_http2.so

diff --git a/mods-available/ident.load b/mods-available/ident.load
new file mode 100644 (file)
index 0000000..f7c4c3c
--- /dev/null
+++ b/mods-available/ident.load
@@ -0,0 +1 @@
+LoadModule ident_module /usr/lib/apache2/modules/mod_ident.so

diff --git a/mods-available/imagemap.load b/mods-available/imagemap.load
new file mode 100644 (file)
index 0000000..0fd55f8
--- /dev/null
+++ b/mods-available/imagemap.load
@@ -0,0 +1 @@
+LoadModule imagemap_module /usr/lib/apache2/modules/mod_imagemap.so

diff --git a/mods-available/mime.conf b/mods-available/mime.conf
index d1b1d89cdd023b99a5d76c9877d5c5971bcd2a67..37dac86c97dbe42104ddb207a69a4fd40f0a153c 100644 (file)
--- a/mods-available/mime.conf
+++ b/mods-available/mime.conf
@@ -242,7 +242,9 @@
        # (You will also need to add "Includes" to the "Options" directive.)
        #
        AddType text/html .shtml
+<IfModule mod_include.c>
        AddOutputFilter INCLUDES .shtml
+</IfModule>
 
 </IfModule>
 

diff --git a/mods-available/php7.0.conf b/mods-available/php7.0.conf
deleted file mode 100644 (file)
index 05161a2..0000000
--- a/mods-available/php7.0.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-<FilesMatch ".+\.ph(p[3457]?|t|tml)$">
-    SetHandler application/x-httpd-php
-</FilesMatch>
-<FilesMatch ".+\.phps$">
-    SetHandler application/x-httpd-php-source
-    # Deny access to raw php sources by default
-    # To re-enable it's recommended to enable access to the files
-    # only in specific virtual host or directory
-    Require all denied
-</FilesMatch>
-# Deny access to files without filename (e.g. '.php')
-<FilesMatch "^\.ph(p[3457]?|t|tml|ps)$">
-    Require all denied
-</FilesMatch>
-
-# Running PHP scripts in user directories is disabled by default
-# 
-# To re-enable PHP in user directories comment the following lines
-# (from <IfModule ...> to </IfModule>.) Do NOT set it to On as it
-# prevents .htaccess files from disabling it.
-<IfModule mod_userdir.c>
-    <Directory /home/*/public_html>
-        #php_admin_flag engine Off
-    </Directory>
-</IfModule>

diff --git a/mods-available/php7.2.conf b/mods-available/php7.2.conf
new file mode 100644 (file)
index 0000000..5d7ff32
--- /dev/null
+++ b/mods-available/php7.2.conf
@@ -0,0 +1,25 @@
+<FilesMatch ".+\.ph(ar|p|tml)$">
+    SetHandler application/x-httpd-php
+</FilesMatch>
+<FilesMatch ".+\.phps$">
+    SetHandler application/x-httpd-php-source
+    # Deny access to raw php sources by default
+    # To re-enable it's recommended to enable access to the files
+    # only in specific virtual host or directory
+    Require all denied
+</FilesMatch>
+# Deny access to files without filename (e.g. '.php')
+<FilesMatch "^\.ph(ar|p|ps|tml)$">
+    Require all denied
+</FilesMatch>
+
+# Running PHP scripts in user directories is disabled by default
+# 
+# To re-enable PHP in user directories comment the following lines
+# (from <IfModule ...> to </IfModule>.) Do NOT set it to On as it
+# prevents .htaccess files from disabling it.
+<IfModule mod_userdir.c>
+    <Directory /home/*/public_html>
+        #php_admin_flag engine Off
+    </Directory>
+</IfModule>

diff --git a/mods-available/php7.2.load b/mods-available/php7.2.load
new file mode 100644 (file)
index 0000000..0ff366e
--- /dev/null
+++ b/mods-available/php7.2.load
@@ -0,0 +1,3 @@
+# Conflicts: php5
+# Depends: mpm_prefork
+LoadModule php7_module /usr/lib/apache2/modules/libphp7.2.so

diff --git a/mods-available/proxy_hcheck.load b/mods-available/proxy_hcheck.load
new file mode 100644 (file)
index 0000000..b70f421
--- /dev/null
+++ b/mods-available/proxy_hcheck.load
@@ -0,0 +1,2 @@
+# Depends: proxy
+LoadModule proxy_hcheck_module /usr/lib/apache2/modules/mod_proxy_hcheck.so

diff --git a/mods-available/proxy_html.load b/mods-available/proxy_html.load
index d8b248e9412acf9aee6809f75cba8a4b578d1613..50f1a2cd40bb3a32d35594310b4db8837061533a 100644 (file)
--- a/mods-available/proxy_html.load
+++ b/mods-available/proxy_html.load
@@ -1,2 +1,2 @@
-# Depends: proxy
+# Depends: proxy xml2enc
 LoadModule proxy_html_module /usr/lib/apache2/modules/mod_proxy_html.so

diff --git a/mods-available/proxy_http2.load b/mods-available/proxy_http2.load
new file mode 100644 (file)
index 0000000..b251d0c
--- /dev/null
+++ b/mods-available/proxy_http2.load
@@ -0,0 +1,2 @@
+# Depends: proxy http2
+LoadModule proxy_http2_module /usr/lib/apache2/modules/mod_proxy_http2.so

diff --git a/mods-available/userdir.conf b/mods-available/userdir.conf
index 3b1305b755f0eb87c394a2b3dc259798dab9c9c2..737abdfb7d7265634840736d5be6e9955a850c92 100644 (file)
--- a/mods-available/userdir.conf
+++ b/mods-available/userdir.conf
@@ -5,12 +5,7 @@
        <Directory /home/*/public_html>
                AllowOverride FileInfo AuthConfig Limit Indexes Options
                Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-               <Limit GET POST OPTIONS>
-                       Require all granted
-               </Limit>
-               <LimitExcept GET POST OPTIONS>
-                       Require all denied
-               </LimitExcept>
+               Require method GET POST OPTIONS
        </Directory>
 </IfModule>
 

diff --git a/mods-enabled/php7.0.conf b/mods-enabled/php7.0.conf
deleted file mode 120000 (symlink)
index 11c4a99..0000000
--- a/mods-enabled/php7.0.conf
+++ /dev/null
@@ -1 +0,0 @@
-../mods-available/php7.0.conf
\ No newline at end of file

diff --git a/mods-enabled/php7.0.load b/mods-enabled/php7.0.load
deleted file mode 120000 (symlink)
index 58e0a2f..0000000
--- a/mods-enabled/php7.0.load
+++ /dev/null
@@ -1 +0,0 @@
-../mods-available/php7.0.load
\ No newline at end of file

diff --git a/mods-enabled/php7.2.conf b/mods-enabled/php7.2.conf
new file mode 120000 (symlink)
index 0000000..8d6058a
--- /dev/null
+++ b/mods-enabled/php7.2.conf
@@ -0,0 +1 @@
+../mods-available/php7.2.conf
\ No newline at end of file

diff --git a/mods-enabled/php7.2.load b/mods-enabled/php7.2.load
new file mode 120000 (symlink)
index 0000000..66b235b
--- /dev/null
+++ b/mods-enabled/php7.2.load
@@ -0,0 +1 @@
+../mods-available/php7.2.load
\ No newline at end of file