diff options
| author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-02-09 15:53:17 +0000 |
|---|---|---|
| committer | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-02-11 18:30:37 +0000 |
| commit | 87bbb000c5e8a53665a85e34011b333b15613a71 (patch) | |
| tree | e988b9604f027eedf823ba1634f04d568e11310c /strata/apache-httpd-server | |
| parent | ef88dd65ebf66ba027be3d2fbd277adf7cacfe64 (diff) | |
| download | definitions-87bbb000c5e8a53665a85e34011b333b15613a71.tar.gz | |
Remove apr-util because it is merged in apr in the latest trunk
Update to the latest apr which contains apr-utils inside.
Add a comment to httpd post-install commands.
Diffstat (limited to 'strata/apache-httpd-server')
| -rw-r--r-- | strata/apache-httpd-server/apr-util.morph | 9 | ||||
| -rw-r--r-- | strata/apache-httpd-server/httpd-server.morph | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/strata/apache-httpd-server/apr-util.morph b/strata/apache-httpd-server/apr-util.morph deleted file mode 100644 index 819858b3..00000000 --- a/strata/apache-httpd-server/apr-util.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: apr-util -kind: chunk -configure-commands: -- ./buildconf --with-apr=/usr/share/apr-1 -- ./configure --prefix="$PREFIX" --with-apr=/usr/bin/apr-2-config -build-commands: -- make -install-commands: -- PREFIX="$PREFIX" DESTDIR="$DESTDIR" make install diff --git a/strata/apache-httpd-server/httpd-server.morph b/strata/apache-httpd-server/httpd-server.morph index d7f84f0a..7e222db9 100644 --- a/strata/apache-httpd-server/httpd-server.morph +++ b/strata/apache-httpd-server/httpd-server.morph @@ -36,4 +36,6 @@ post-install-commands: sed -i 's|#!/replace/with/path/to/perl/interpreter -w|#!/usr/bin/perl -w|g' \ "$DESTDIR$PREFIX"/bin/apxs - mkdir -p "$DESTDIR$PREFIX"/httpd/conf.d +# Add conf.d directory as a directory where apache will be looking for other configurations +# to load. - echo 'Include /usr/httpd/conf.d/*.conf' >> "$DESTDIR$PREFIX"/httpd/conf/httpd.conf |