diff options
| author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-01-16 13:38:53 +0000 |
|---|---|---|
| committer | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-01-22 12:46:30 +0000 |
| commit | e3c2492c9463d7cd47d06ed4040d8c6c21235313 (patch) | |
| tree | 73b14a027872bf676f89c0f34fe8205c8594680c /openstack | |
| parent | 302a56fe58e762b17bdbbfa987e8011f33be0b9a (diff) | |
| download | definitions-e3c2492c9463d7cd47d06ed4040d8c6c21235313.tar.gz | |
FIXUPME: use redhat directory tree layout by default for apache
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/etc/systemd/system/apache-httpd.service | 8 | ||||
| -rwxr-xr-x | openstack/usr/share/openstack/apache-httpd-server-setup | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/openstack/etc/systemd/system/apache-httpd.service b/openstack/etc/systemd/system/apache-httpd.service index 967ec71a..3fe2f165 100644 --- a/openstack/etc/systemd/system/apache-httpd.service +++ b/openstack/etc/systemd/system/apache-httpd.service @@ -5,10 +5,10 @@ After=network.target remote-fs.target nss-lookup.target apache-httpd-server-setu [Service] Type=forking -PIDFile=/var/run/httpd/httpd.pid -ExecStart=/usr/bin/apachectl start -ExecStop=/usr/bin/apachectl graceful-stop -ExecReload=/usr/bin/apachectl graceful +PIDFile=/var/run/httpd.pid +ExecStart=/usr/sbin/apachectl start +ExecStop=/usr/sbin/apachectl graceful-stop +ExecReload=/usr/sbin/apachectl graceful PrivateTmp=true LimitNOFILE=infinity diff --git a/openstack/usr/share/openstack/apache-httpd-server-setup b/openstack/usr/share/openstack/apache-httpd-server-setup index 11e88fb2..c6ec56d9 100755 --- a/openstack/usr/share/openstack/apache-httpd-server-setup +++ b/openstack/usr/share/openstack/apache-httpd-server-setup @@ -21,7 +21,7 @@ set -e if [ -f /var/openstack/apache-http-setup ]; then - exit 0 + exit 0 fi ############################################################################### @@ -38,14 +38,13 @@ useradd -c "Apache Server" -d /srv/www -g apache \ # Check configure in strata/apache-httpd-server/httpd-server.morph # ############################################################################### mkdir -p /usr/lib/httpd -mv -v /usr/bin/suexec /usr/lib/httpd/suexec +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 -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 + +exit 0 |