summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-13 09:18:45 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-22 12:46:29 +0000
commit78c785b3394c47c953e0c445b42606db04f9ff49 (patch)
tree6546dfe19ca4089674706afa3f324ed2092676cc
parent957ba693fd5d0c1041d7b83f0497766337ffc2b1 (diff)
downloaddefinitions-78c785b3394c47c953e0c445b42606db04f9ff49.tar.gz
FIXUPME: Fix httpd-server chunk
Changes made: - Enable so, all-modules and all modules shared - Remove user creation from system integration commands. - Add correct perl interpreter to apxs script.
-rw-r--r--strata/apache-httpd-server/httpd-server.morph22
1 files changed, 8 insertions, 14 deletions
diff --git a/strata/apache-httpd-server/httpd-server.morph b/strata/apache-httpd-server/httpd-server.morph
index 901ea31a..18d63c6a 100644
--- a/strata/apache-httpd-server/httpd-server.morph
+++ b/strata/apache-httpd-server/httpd-server.morph
@@ -4,8 +4,9 @@ configure-commands:
- ./buildconf --with-apr=/usr/share/apr-1
- |
./configure --prefix="$PREFIX" \
+ --enable-load-all-modules \
--enable-authnz-fcgi \
- --enable-mods-shared=all \
+ --enable-mods-shared=reallyall \
--enable-mpms-shared=all \
--enable-suexec=shared \
--with-apr=/usr/bin/apr-2-config \
@@ -15,20 +16,13 @@ configure-commands:
--with-suexec-docroot=/srv/www \
--with-suexec-logfile=/var/log/httpd/suexec.log \
--with-suexec-uidmin=100 \
- --with-suexec-userdir=public_html
+ --with-suexec-userdir=public_html \
+ --enable-so
build-commands:
- make
install-commands:
- PREFIX="$PREFIX" DESTDIR="$DESTDIR" make install
-system-integration:
- httpd-server-misc:
- 01-adduser:
- - groupadd -g 25 apache
- - |
- useradd -c "Apache Server" -d /srv/www -g apache \
- -s /bin/false -u 25 apache
- 02-configure-httpd-server:
- - mv -v /usr/sbin/suexec /usr/lib/httpd/suexec
- - chgrp apache /usr/lib/httpd/suexec
- - chmod 4754 /usr/lib/httpd/suexec
- - chown -v -R apache:apache /srv/www
+post-install-commands:
+- |
+ sed -i 's|#!/replace/with/path/to/perl/interpreter -w|#!/usr/bin/perl -w|g' \
+ "$DESTDIR$PREFIX"/bin/apxs