jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

apache-2.4.10: revert and fix httpd.conf

Browse source 
Just add missing dependencies instead of removing broken features.
This commit is contained in:
dota? =op 2015-01-06 04:36:37 -02:00
parent f1af586879
commit ea5e4af864
1 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
srcpkgs/apache/template
View file

@ -1,7 +1,7 @@
# Template file for 'apache' # Template file for 'apache'
pkgname=apache pkgname=apache
version=2.4.10 version=2.4.10
revision=5 revision=6
wrksrc=httpd-${version} wrksrc=httpd-${version}
build_style=gnu-configure build_style=gnu-configure
configure_args="--prefix= --enable-pie --enable-modules=all configure_args="--prefix= --enable-pie --enable-modules=all
@ -74,34 +74,41 @@ pre_configure() {
} }
post_install() { post_install() {
# Enable userdir, languages, autoindex, errors. # Set a working ServerRoot
# Set a working ServerRoot, disable mod_unique_id. #
# Load modules:
# * mod_include.so
# * mod_slotmem_shm.so
# * mod_negotiation.so
# * mod_userdir.so
#
# Avoid loading modules:
# * mod_unique_id.so
#
# Set and enable ServerName to 127.0.0.1. # Set and enable ServerName to 127.0.0.1.
# FIXME:
# #
# don't include: # include extras:
# #Include /etc/httpd/extra/httpd-multilang-errordoc.conf # * httpd-multilang-errordoc.conf
# #Include /etc/httpd/extra/httpd-languages.conf # * httpd-autoindex.conf
# #Include /etc/httpd/extra/httpd-userdir.conf # * httpd-languages.conf
# * httpd-userdir.conf
# * httpd-default.conf
# #
# and load:
# LoadModule slotmem_shm_module /usr/libexec/httpd/mod_slotmem_shm.so
#
# until a solution is found, since they don't allow httpd to start!
#
# -e 's|#\(Include /etc/httpd/extra/httpd-multilang-errordoc.conf\)|\1|' \
# -e 's|#\(Include /etc/httpd/extra/httpd-languages.conf\)|\1|' \
# -e 's|#\(Include /etc/httpd/extra/httpd-userdir.conf\)|\1|' \
sed \ sed \
-e 's|#\(Include /etc/httpd/extra/httpd-autoindex.conf\)|\1|' \ -e 's|ServerRoot ""|ServerRoot "/etc/httpd"|' \
-e 's|#\(Include /etc/httpd/extra/httpd-default.conf\)|\1|' \ -e 's|#\(LoadModule include_module /usr/libexec/httpd/mod_include.so\)|\1|' \
-e 's|ServerRoot \"\"|ServerRoot \"/etc/httpd\"|' \ -e 's|\(LoadModule unique_id_module /usr/libexec/httpd/mod_unique_id.so\)|#\1|' \
-e 's|#\(ServerName\).*|\1 127.0.0.1:80|' \
-e 's|\(LoadModule unique_id_module.*\)|#\1|' \
-e 's|#\(LoadModule slotmem_shm_module /usr/libexec/httpd/mod_slotmem_shm.so\)|\1|' \ -e 's|#\(LoadModule slotmem_shm_module /usr/libexec/httpd/mod_slotmem_shm.so\)|\1|' \
-i ${DESTDIR}/etc/httpd/httpd.conf -e 's|#\(LoadModule negotiation_module /usr/libexec/httpd/mod_negotiation.so\)|\1|' \
-e 's|#\(LoadModule userdir_module /usr/libexec/httpd/mod_userdir.so\)|\1|' \
-e 's|#ServerName www.example.com:80|ServerName 127.0.0.1:80|' \
-e 's|#\(Include /etc/httpd/extra/httpd-multilang-errordoc.conf\)|\1|' \
-e 's|#\(Include /etc/httpd/extra/httpd-autoindex.conf\)|\1|' \
-e 's|#\(Include /etc/httpd/extra/httpd-languages.conf\)|\1|' \
-e 's|#\(Include /etc/httpd/extra/httpd-userdir.conf\)|\1|' \
-e 's|#\(Include /etc/httpd/extra/httpd-default.conf\)|\1|' \
-i "${DESTDIR}/etc/httpd/httpd.conf"
# symlinks for /etc/httpd # symlinks for /etc/httpd
ln -fs /var/log/httpd ${DESTDIR}/etc/httpd/logs ln -fs /var/log/httpd ${DESTDIR}/etc/httpd/logs