summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-15 17:15:33 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-11 18:30:34 +0000
commitf7f9966733de8afc32165e5888e322ede6672fb2 (patch)
treee8a7f83a6fc56211c21c19021f390b3d5ecd50c0
parent43d8d6b462999921d90bdd56dd0b4afbb376ab07 (diff)
downloaddefinitions-f7f9966733de8afc32165e5888e322ede6672fb2.tar.gz
REMOVEME: workaround to exit of the httpd setup service when has been called before
-rwxr-xr-xopenstack/usr/share/openstack/apache-httpd-server-setup9
1 files changed, 9 insertions, 0 deletions
diff --git a/openstack/usr/share/openstack/apache-httpd-server-setup b/openstack/usr/share/openstack/apache-httpd-server-setup
index 7b10bd64..11e88fb2 100755
--- a/openstack/usr/share/openstack/apache-httpd-server-setup
+++ b/openstack/usr/share/openstack/apache-httpd-server-setup
@@ -20,6 +20,10 @@
# as default shell in gerrit systems.
set -e
+if [ -f /var/openstack/apache-http-setup ]; then
+ exit 0
+fi
+
###############################################################################
# Move suexec to the directory where apache is configured to have it #
# Check configure in strata/apache-httpd-server/httpd-server.morph #
@@ -40,3 +44,8 @@ chmod 4754 /usr/lib/httpd/suexec
chown -R apache:apache /srv/www
mkdir -p /var/run/httpd/
chown -R apache:apache /var/run/httpd
+
+
+install -D -m 644 /proc/self/fd/0 <<'EOF' /var/openstack/apache-http-setup
+Apache http setup: success
+EOF