diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-09-11 14:52:18 +0300 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-12-15 11:31:36 +0200 |
| commit | dfb1e11b9edcfe9876e8130da45d06cb31d6fa03 (patch) | |
| tree | 756a50f5dafc8a753821d56f537dec97b76532fb /main/apache2/conf/0014-httpd-.conf-LoadModule.patch | |
| parent | 96e51aae7baf5ac9bdbc14bdada5e3f1c8d404f6 (diff) | |
| download | aports-dfb1e11b9edcfe9876e8130da45d06cb31d6fa03.tar.bz2 aports-dfb1e11b9edcfe9876e8130da45d06cb31d6fa03.tar.xz | |
main/apache2: base configuration on upstream default files
Diffstat (limited to 'main/apache2/conf/0014-httpd-.conf-LoadModule.patch')
| -rw-r--r-- | main/apache2/conf/0014-httpd-.conf-LoadModule.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/main/apache2/conf/0014-httpd-.conf-LoadModule.patch b/main/apache2/conf/0014-httpd-.conf-LoadModule.patch new file mode 100644 index 0000000000..f768a870b4 --- /dev/null +++ b/main/apache2/conf/0014-httpd-.conf-LoadModule.patch @@ -0,0 +1,72 @@ +From d820e295733d804e863925c45558ea7d461f1fde Mon Sep 17 00:00:00 2001 +From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> +Date: Fri, 11 Sep 2015 15:12:08 +0300 +Subject: [PATCH 14/14] httpd*.conf: LoadModule + +--- + docs/conf/extra/httpd-dav.conf.in | 3 +++ + docs/conf/extra/httpd-ssl.conf.in | 2 ++ + docs/conf/extra/proxy-html.conf.in | 6 +++--- + docs/conf/httpd.conf.in | 2 ++ + 4 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/docs/conf/extra/httpd-dav.conf.in b/docs/conf/extra/httpd-dav.conf.in +index 416110b..1e225e4 100644 +--- a/docs/conf/extra/httpd-dav.conf.in ++++ b/docs/conf/extra/httpd-dav.conf.in +@@ -4,6 +4,9 @@ + # Required modules: mod_alias, mod_auth_digest, mod_authn_core, mod_authn_file, + # mod_authz_core, mod_authz_user, mod_dav, mod_dav_fs, + # mod_setenvif ++LoadModule auth_digest_module lib/apache2/mod_auth_digest.so ++LoadModule dav_module lib/apache2/mod_dav.so ++LoadModule dav_fs_module lib/apache2/mod_dav_fs.so + + # The following example gives DAV write access to a directory called + # "uploads" under the ServerRoot directory. +diff --git a/docs/conf/extra/httpd-ssl.conf.in b/docs/conf/extra/httpd-ssl.conf.in +index 4534852..e27070e 100644 +--- a/docs/conf/extra/httpd-ssl.conf.in ++++ b/docs/conf/extra/httpd-ssl.conf.in +@@ -10,6 +10,8 @@ + # + # Required modules: mod_log_config, mod_setenvif, mod_ssl, + # socache_shmcb_module (for default value of SSLSessionCache) ++LoadModule ssl_module lib/apache2/mod_ssl.so ++LoadModule socache_shmcb_module lib/apache2/mod_socache_shmcb.so + + # + # Pseudo Random Number Generator (PRNG): +diff --git a/docs/conf/extra/proxy-html.conf.in b/docs/conf/extra/proxy-html.conf.in +index 683a091..0648e8e 100644 +--- a/docs/conf/extra/proxy-html.conf.in ++++ b/docs/conf/extra/proxy-html.conf.in +@@ -10,9 +10,9 @@ + # mangle pages in encodings other than ASCII or Unicode (utf-8). + # + # For Unix-family systems: +-# LoadFile /usr/lib/libxml2.so +-# LoadModule proxy_html_module modules/mod_proxy_html.so +-# LoadModule xml2enc_module modules/mod_xml2enc.so ++LoadFile /usr/lib/libxml2.so ++LoadModule proxy_html_module modules/mod_proxy_html.so ++LoadModule xml2enc_module modules/mod_xml2enc.so + # + # For Windows (I don't know if there's a standard path for the libraries) + # LoadFile C:/path/zlib.dll +diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in +index c6092b3..929ebfc 100644 +--- a/docs/conf/httpd.conf.in ++++ b/docs/conf/httpd.conf.in +@@ -75,6 +75,8 @@ Listen @@Port@@ + # + @@LoadModule@@ + ++LoadModule negotiation_module lib/apache2/mod_negotiation.so ++ + <IfModule unixd_module> + # + # If you wish httpd to run as a different user or group, you must run +-- +2.5.0 + |