summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-09 15:53:17 (GMT)
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-09 15:53:17 (GMT)
commit6d4014bfbed7492612365b44cad5ca32e975a2cf (patch)
tree1c6334766a7227c437a9ef99ef1e79cf4943419f
parentbfdb2d1ad1ecc5d310111bf8e4cdbdc8466bbbb5 (diff)
downloaddefinitions-6d4014bfbed7492612365b44cad5ca32e975a2cf.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.
-rw-r--r--strata/apache-httpd-server.morph14
-rw-r--r--strata/apache-httpd-server/apr-util.morph9
-rw-r--r--strata/apache-httpd-server/httpd-server.morph2
3 files changed, 5 insertions, 20 deletions
diff --git a/strata/apache-httpd-server.morph b/strata/apache-httpd-server.morph
index 3a02aa0..a8c71aa 100644
--- a/strata/apache-httpd-server.morph
+++ b/strata/apache-httpd-server.morph
@@ -7,17 +7,10 @@ build-depends:
chunks:
- name: apr
morph: strata/apache-httpd-server/apr.morph
- repo: https://github.com/apache/apr.git
- ref: 4ea9d6236ef2b9eb79feb05167d50c1a732420f0
- unpetrify-ref: master
+ repo: git://git.apache.org/apr.git
+ ref: 3c818c6d7351f0130282d212a69035642f5fecad
+ unpetrify-ref: trunk
build-depends: []
-- name: apr-util
- morph: strata/apache-httpd-server/apr-util.morph
- repo: https://github.com/apache/apr-util.git
- ref: 9890706bda63c5d5d5197d482c1b682240431465
- unpetrify-ref: 1.5.4
- build-depends:
- - apr
- name: httpd
morph: strata/apache-httpd-server/httpd-server.morph
repo: git://git.apache.org/httpd.git
@@ -25,7 +18,6 @@ chunks:
unpetrify-ref: 2.4.10
build-depends:
- apr
- - apr-util
- name: psutil
repo: github:giampaolo/psutil
ref: 2bc8555f0428af81c2d067aa76168ed7bc5e0179
diff --git a/strata/apache-httpd-server/apr-util.morph b/strata/apache-httpd-server/apr-util.morph
deleted file mode 100644
index 819858b..0000000
--- 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 d7f84f0..7e222db 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