rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix manual.conf

Browse Source
This commit is contained in:
Joe Orton 2012-03-13 16:58:07 +00:00
parent 2ef12c9266
commit dd94df0be1
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
httpd.spec
View File

@ -30,6 +30,7 @@ Source19: 00-proxyhtml.conf
Source20: userdir.conf Source20: userdir.conf
Source21: ssl.conf Source21: ssl.conf
Source22: welcome.conf Source22: welcome.conf
Source23: manual.conf
# Documentation # Documentation
Source30: README.confd Source30: README.confd
# build/scripts patches # 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 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/$f
done 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 \ install -m 644 -p $RPM_SOURCE_DIR/$f \
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/$f $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/$f
done done
# Split-out extra config shipped as default in conf.d: # 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 \ mv docs/conf/extra/httpd-${f}.conf \
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/${f}.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/${f}.conf
done done
@ -554,6 +555,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Mar 13 2012 Joe Orton <jorton@redhat.com> - 2.4.1-4 * Tue Mar 13 2012 Joe Orton <jorton@redhat.com> - 2.4.1-4
- fix symlink for poweredby.png - fix symlink for poweredby.png
- fix manual.conf
* Tue Mar 13 2012 Joe Orton <jorton@redhat.com> - 2.4.1-3 * Tue Mar 13 2012 Joe Orton <jorton@redhat.com> - 2.4.1-3
- add mod_proxy_html subpackage (w/mod_proxy_html + mod_xml2enc) - add mod_proxy_html subpackage (w/mod_proxy_html + mod_xml2enc)

11
manual.conf Normal file
View File

@ -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>