summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-18 14:54:37 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-14 12:07:11 (GMT)
commit025786557031e6bb73000fd048894d3a499639b2 (patch)
tree8fdebcc1155f0cf98fc292ed31ca0251316cc688
parent78999f172e32c93509222b00a3568fc58b730c1d (diff)
downloaddefinitions-025786557031e6bb73000fd048894d3a499639b2.tar.gz
Fix apache-httpd and horizon setup because of the change of layout
-rwxr-xr-xopenstack/usr/share/openstack/apache-httpd-server-setup6
-rw-r--r--openstack/usr/share/openstack/openstack-horizon-setup2
2 files changed, 4 insertions, 4 deletions
diff --git a/openstack/usr/share/openstack/apache-httpd-server-setup b/openstack/usr/share/openstack/apache-httpd-server-setup
index 4c0b3ce..8f8cdd6 100755
--- a/openstack/usr/share/openstack/apache-httpd-server-setup
+++ b/openstack/usr/share/openstack/apache-httpd-server-setup
@@ -25,9 +25,9 @@ fi
# Move suexec to the directory where apache is configured to have it #
# Check configure in strata/apache-httpd-server/httpd-server.morph #
###############################################################################
-mkdir -p /srv/www
+mkdir -p /var/www
groupadd -r apache
-useradd -c "Apache Server" -d /srv/www -g apache \
+useradd -c "Apache Server" -d /var/www -g apache \
-s /bin/false apache
###############################################################################
@@ -38,7 +38,7 @@ mkdir -p /usr/lib/httpd
mv -v /usr/sbin/suexec /usr/lib/httpd/suexec
chgrp apache /usr/lib/httpd/suexec
chmod 4754 /usr/lib/httpd/suexec
-chown -R apache:apache /srv/www
+chown -R apache:apache /var/www
install -D -m 644 /proc/self/fd/0 <<'EOF' /var/openstack/apache-http-setup
Apache http setup: success
diff --git a/openstack/usr/share/openstack/openstack-horizon-setup b/openstack/usr/share/openstack/openstack-horizon-setup
index 4365232..c8b1512 100644
--- a/openstack/usr/share/openstack/openstack-horizon-setup
+++ b/openstack/usr/share/openstack/openstack-horizon-setup
@@ -52,7 +52,7 @@ mkdir -p /var/lib/horizon/.blackhole
# Link horizon configuration file for apache to the directory where our apache load
# configurations files
ln -sf /etc/horizon/apache-horizon.conf \
- /usr/httpd/conf.d/apache-horizon.conf
+ /etc/httpd/conf.d/apache-horizon.conf
chown -R horizon:horizon /var/lib/horizon