diff options
| author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-02-18 14:54:37 +0000 |
|---|---|---|
| committer | Richard Ipsum <richardipsum@fastmail.co.uk> | 2015-04-10 20:17:43 +0100 |
| commit | fc10c7dc05763447ec161ad5af5b08e58c602593 (patch) | |
| tree | 84a36991af1ab1a8b91de08d2a7f7acafdb6614d | |
| parent | 956a99b650716dfac9790aeaa40cb69d7436a88c (diff) | |
| download | definitions-fc10c7dc05763447ec161ad5af5b08e58c602593.tar.gz | |
Fix apache-httpd and horizon setup because of the change of layout
| -rwxr-xr-x | openstack/usr/share/openstack/apache-httpd-server-setup | 6 | ||||
| -rw-r--r-- | openstack/usr/share/openstack/openstack-horizon-setup | 2 |
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 4c0b3cee..8f8cdd60 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 43652322..c8b15125 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 |