diff options
author | Joe Orton <jorton@redhat.com> | 2012-03-13 16:58:07 +0000 |
---|---|---|
committer | Joe Orton <jorton@redhat.com> | 2012-03-13 16:58:07 +0000 |
commit | dd94df0be1191c0cd76a708d1ccbc45da537ac9f (patch) | |
tree | f9d804f068c946ca5a444b2c2d2ecea268861d31 | |
parent | 2ef12c9266c74bcd6807715c5c61b873167b1daf (diff) | |
download | httpd-dd94df0be1191c0cd76a708d1ccbc45da537ac9f.tar.gz httpd-dd94df0be1191c0cd76a708d1ccbc45da537ac9f.tar.xz httpd-dd94df0be1191c0cd76a708d1ccbc45da537ac9f.zip |
fix manual.conf
-rw-r--r-- | httpd.spec | 6 | ||||
-rw-r--r-- | manual.conf | 11 |
2 files changed, 15 insertions, 2 deletions
@@ -30,6 +30,7 @@ Source19: 00-proxyhtml.conf Source20: userdir.conf Source21: ssl.conf Source22: welcome.conf +Source23: manual.conf # Documentation Source30: README.confd # build/scripts patches @@ -240,13 +241,13 @@ for f in 00-base.conf 00-mpm.conf 00-lua.conf 01-cgi.conf 00-dav.conf \ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/$f done -for f in welcome.conf ssl.conf userdir.conf; do +for f in welcome.conf ssl.conf manual.conf userdir.conf; do install -m 644 -p $RPM_SOURCE_DIR/$f \ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/$f done # Split-out extra config shipped as default in conf.d: -for f in manual autoindex; do +for f in autoindex; do mv docs/conf/extra/httpd-${f}.conf \ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/${f}.conf done @@ -554,6 +555,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Mar 13 2012 Joe Orton <jorton@redhat.com> - 2.4.1-4 - fix symlink for poweredby.png +- fix manual.conf * Tue Mar 13 2012 Joe Orton <jorton@redhat.com> - 2.4.1-3 - add mod_proxy_html subpackage (w/mod_proxy_html + mod_xml2enc) diff --git a/manual.conf b/manual.conf new file mode 100644 index 0000000..d09757d --- /dev/null +++ b/manual.conf @@ -0,0 +1,11 @@ +# +# This configuration file allows the manual to be accessed at +# http://localhost/manual/ +# +AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "/usr/share/httpd/manual$1" + +<Directory "/usr/share/httpd/manual"> + Options Indexes + AllowOverride None + Require all granted +</Directory> |