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-02-11 18:30:34 +0000 |
| commit | 72d4e9f7dd07e22d0c81cd9de2d24cc1c2d351e9 (patch) | |
| tree | cfaff8a83f1bf1533351367dd3dab1233e9481fc | |
| parent | 2c6ee7852dd79424c5ff15e4051d917a6d537457 (diff) | |
| download | definitions-72d4e9f7dd07e22d0c81cd9de2d24cc1c2d351e9.tar.gz | |
FIXUPME: use redhat directory tree layout by default for apache
| -rw-r--r-- | openstack/etc/systemd/system/apache-httpd.service | 8 | ||||
| -rwxr-xr-x | openstack/usr/share/openstack/apache-httpd-server-setup | 9 | ||||
| -rw-r--r-- | strata/apache-httpd-server/httpd-server.morph | 1 |
3 files changed, 9 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 diff --git a/strata/apache-httpd-server/httpd-server.morph b/strata/apache-httpd-server/httpd-server.morph index 8aa5aa0a..d7f84f0a 100644 --- a/strata/apache-httpd-server/httpd-server.morph +++ b/strata/apache-httpd-server/httpd-server.morph @@ -9,6 +9,7 @@ configure-commands: --includedir="$PREFIX"/httpd \ --libexecdir="$PREFIX"/lib/httpd/modules \ --datadir=/srv/www \ + --enable-layout=RedHat \ --enable-mpms-shared=all \ --with-apr=/usr/bin/apr-2-config \ --with-apr-util=/usr/bin/apu-1-config \ |