diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2012-03-24 17:56:40 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2012-03-24 17:56:40 +0100 |
| commit | 43cedb173068dcbeb4469af465bb0981ea456654 (patch) | |
| tree | 9b2f80024e8b670d745a760ce56cdf8056310e3b | |
| parent | 624f3ea5d68b2ccd3cd7d9b0d3987b586efd15b9 (diff) | |
| download | apache2-43cedb173068dcbeb4469af465bb0981ea456654.tar.gz | |
Move /usr/share/doc alias to separate config file and don't enable it
by default.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/config-dir/conf-available/alias_usr_share_doc.conf | 6 | ||||
| -rw-r--r-- | debian/config-dir/sites-available/000-default.conf | 8 | ||||
| -rw-r--r-- | debian/config-dir/sites-available/default-ssl.conf | 7 |
4 files changed, 12 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog index ddb3a031..7745f6d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,16 @@ apache2 (2.4.1-3) experimental; urgency=low + [ Arno Töll ] * apache2-suexec-{custom,pristine}: Fix argument order when removing alternatives, do not remove alternatives on upgrades. Thanks Andreas Beckmann for spotting the issue (Closes: #665002) * Install suexec(8) link to /usr/share/man/man8/... - -- Arno Töll <debian@toell.net> Thu, 22 Mar 2012 12:37:39 +0100 + [ Stefan Fritsch ] + * Move /usr/share/doc alias to separate config file and don't enable it + by default. + + -- Stefan Fritsch <sf@debian.org> Sat, 24 Mar 2012 17:55:03 +0100 apache2 (2.4.1-2) experimental; urgency=low diff --git a/debian/config-dir/conf-available/alias_usr_share_doc.conf b/debian/config-dir/conf-available/alias_usr_share_doc.conf new file mode 100644 index 00000000..6f1c6a67 --- /dev/null +++ b/debian/config-dir/conf-available/alias_usr_share_doc.conf @@ -0,0 +1,6 @@ +Alias /doc/ "/usr/share/doc/" +<Directory "/usr/share/doc/"> + Options Indexes MultiViews FollowSymLinks + AllowOverride None + Require local +</Directory> diff --git a/debian/config-dir/sites-available/000-default.conf b/debian/config-dir/sites-available/000-default.conf index 05050295..6833f8cb 100644 --- a/debian/config-dir/sites-available/000-default.conf +++ b/debian/config-dir/sites-available/000-default.conf @@ -15,12 +15,4 @@ LogLevel warn CustomLog ${APACHE_LOG_DIR}/access.log combined - - Alias /doc/ "/usr/share/doc/" - <Directory "/usr/share/doc/"> - Options Indexes MultiViews FollowSymLinks - AllowOverride None - Require local - </Directory> - </VirtualHost> diff --git a/debian/config-dir/sites-available/default-ssl.conf b/debian/config-dir/sites-available/default-ssl.conf index a82da209..3959ea37 100644 --- a/debian/config-dir/sites-available/default-ssl.conf +++ b/debian/config-dir/sites-available/default-ssl.conf @@ -17,13 +17,6 @@ CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined - Alias /doc/ "/usr/share/doc/" - <Directory "/usr/share/doc/"> - Options Indexes MultiViews FollowSymLinks - AllowOverride None - Require local - </Directory> - # SSL Engine Switch: # Enable/Disable SSL for this virtual host. SSLEngine on |