summaryrefslogtreecommitdiff
path: root/strata
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-13 09:28:15 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-22 12:46:29 +0000
commitc763824af2c4c0e0fd81f2d0c6aba34991a3784d (patch)
treec67f895851fa27ef334fa38c84251d66f9e88a7a /strata
parentcff0d075a5ae70bc61fb96c5636527bcadbc0b6b (diff)
downloaddefinitions-c763824af2c4c0e0fd81f2d0c6aba34991a3784d.tar.gz
Add mod_wsgi to httpd-apache-server stratum
Diffstat (limited to 'strata')
-rw-r--r--strata/apache-httpd-server.morph22
-rw-r--r--strata/apache-httpd-server/apr.morph6
-rw-r--r--strata/apache-httpd-server/mod_wsgi.morph10
3 files changed, 36 insertions, 2 deletions
diff --git a/strata/apache-httpd-server.morph b/strata/apache-httpd-server.morph
index 4231b285..3a02aa0c 100644
--- a/strata/apache-httpd-server.morph
+++ b/strata/apache-httpd-server.morph
@@ -1,6 +1,6 @@
name: apache-httpd-server
kind: stratum
-description: apache http web server
+description: apache http web server and some utilities related to it
build-depends:
- morph: strata/tools.morph
- morph: strata/pcre-utils.morph
@@ -26,3 +26,23 @@ chunks:
build-depends:
- apr
- apr-util
+- name: psutil
+ repo: github:giampaolo/psutil
+ ref: 2bc8555f0428af81c2d067aa76168ed7bc5e0179
+ unpetrify-ref: release-2.2.0
+ build-depends: []
+- name: mod_wsgi-metrics
+ repo: github:GrahamDumpleton/mod_wsgi-metrics
+ ref: ec715eb593255229f9f45f3f323edbb845c691d8
+ unpetrify-ref: 1.1.1
+ build-depends:
+ - psutil
+- name: mod_wsgi
+ morph: strata/apache-httpd-server/mod_wsgi.morph
+ repo: github:GrahamDumpleton/mod_wsgi
+ ref: 1be8b37aaf07d8cb3083da99d6fda12375221b07
+ unpetrify-ref: 4.4.5
+ build-depends:
+ - apr
+ - httpd
+ - mod_wsgi-metrics
diff --git a/strata/apache-httpd-server/apr.morph b/strata/apache-httpd-server/apr.morph
index 4c09b98c..6b7c8a41 100644
--- a/strata/apache-httpd-server/apr.morph
+++ b/strata/apache-httpd-server/apr.morph
@@ -16,5 +16,9 @@ install-commands:
config.guess config.sub; do \
cp build/$file "$DESTDIR$PREFIX"/share/apr-1/build/$file ; \
done
-# Create a symlink in the build directory to the include directory
+# Create a symlink in the build directory to the include directory (this is needed for httpd)
- ln -sf /usr/include/apr-2 "$DESTDIR$PREFIX"/share/apr-1/build/
+post-install-commands:
+# Copy apr headers needed for mod_wsgi
+- cp include/private/apr_support.h "$DESTDIR$PREFIX"/include/apr-2
+- cp include/arch/unix/apr_private.h "$DESTDIR$PREFIX"/include/apr-2
diff --git a/strata/apache-httpd-server/mod_wsgi.morph b/strata/apache-httpd-server/mod_wsgi.morph
new file mode 100644
index 00000000..ef354a6c
--- /dev/null
+++ b/strata/apache-httpd-server/mod_wsgi.morph
@@ -0,0 +1,10 @@
+name: mod_wsgi
+kind: chunk
+configure-commands:
+- |
+ ./configure --prefix="$PREFIX" \
+ --with-apxs=/usr/bin/apxs
+build-commands:
+- make
+install-commands:
+- PREFIX="$PREFIX" DESTDIR="$DESTDIR" make install