From 6488d16ad1690b0e3c9472b1dd33ddb0a27864fe Mon Sep 17 00:00:00 2001 From: Alex Dehnert Date: Mon, 6 May 2019 01:30:39 -0400 Subject: [PATCH 1/1] Apache updates for Bionic (18.04) My personal site isn't working right, but Apache as a whole seems mostly okay. --- apache2.conf | 8 +++++++- envvars | 2 +- mods-available/cern_meta.load | 1 + mods-available/deflate.conf | 6 +----- mods-available/http2.load | 1 + mods-available/ident.load | 1 + mods-available/imagemap.load | 1 + mods-available/mime.conf | 2 ++ mods-available/{php7.0.conf => php7.2.conf} | 4 ++-- mods-available/php7.2.load | 3 +++ mods-available/proxy_hcheck.load | 2 ++ mods-available/proxy_html.load | 2 +- mods-available/proxy_http2.load | 2 ++ mods-available/userdir.conf | 7 +------ mods-enabled/php7.0.conf | 1 - mods-enabled/php7.0.load | 1 - mods-enabled/php7.2.conf | 1 + mods-enabled/php7.2.load | 1 + 18 files changed, 28 insertions(+), 18 deletions(-) create mode 100644 mods-available/cern_meta.load create mode 100644 mods-available/http2.load create mode 100644 mods-available/ident.load create mode 100644 mods-available/imagemap.load rename mods-available/{php7.0.conf => php7.2.conf} (90%) create mode 100644 mods-available/php7.2.load create mode 100644 mods-available/proxy_hcheck.load create mode 100644 mods-available/proxy_http2.load delete mode 120000 mods-enabled/php7.0.conf delete mode 120000 mods-enabled/php7.0.load create mode 120000 mods-enabled/php7.2.conf create mode 120000 mods-enabled/php7.2.load diff --git a/apache2.conf b/apache2.conf index baf6d8a..ae4b2c3 100644 --- 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 91328ac..708d170 100644 --- 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 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 91d7f33..db48f92 100644 --- a/mods-available/deflate.conf +++ b/mods-available/deflate.conf @@ -1,10 +1,6 @@ - # 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 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 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 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 d1b1d89..37dac86 100644 --- 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 + AddOutputFilter INCLUDES .shtml + diff --git a/mods-available/php7.0.conf b/mods-available/php7.2.conf similarity index 90% rename from mods-available/php7.0.conf rename to mods-available/php7.2.conf index 05161a2..5d7ff32 100644 --- a/mods-available/php7.0.conf +++ b/mods-available/php7.2.conf @@ -1,4 +1,4 @@ - + SetHandler application/x-httpd-php @@ -9,7 +9,7 @@ Require all denied # Deny access to files without filename (e.g. '.php') - + Require all denied diff --git a/mods-available/php7.2.load b/mods-available/php7.2.load new file mode 100644 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 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 d8b248e..50f1a2c 100644 --- 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 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 3b1305b..737abdf 100644 --- a/mods-available/userdir.conf +++ b/mods-available/userdir.conf @@ -5,12 +5,7 @@ AllowOverride FileInfo AuthConfig Limit Indexes Options Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec - - Require all granted - - - Require all denied - + Require method GET POST OPTIONS diff --git a/mods-enabled/php7.0.conf b/mods-enabled/php7.0.conf deleted file mode 120000 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 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 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 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 -- 2.34.1