diff options
author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-01-15 17:14:48 +0000 |
---|---|---|
committer | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-01-22 12:46:30 +0000 |
commit | a021ff81ce071b85db4ea2447a7cf5cc75002039 (patch) | |
tree | 9745a2c22bfd0ffa660fe46557a3c4c13a4c518e | |
parent | 41d2f5c550c03f17e29f596d0639f1f607201458 (diff) | |
download | definitions-a021ff81ce071b85db4ea2447a7cf5cc75002039.tar.gz |
Add apache-httpd-server service
-rw-r--r-- | apache-httpd-server.configure | 4 | ||||
-rw-r--r-- | openstack/etc/systemd/system/apache-httpd.service | 16 | ||||
-rw-r--r-- | openstack/manifest | 1 | ||||
-rwxr-xr-x | openstack/usr/share/openstack/apache-httpd-server-setup | 2 |
4 files changed, 21 insertions, 2 deletions
diff --git a/apache-httpd-server.configure b/apache-httpd-server.configure index a7333e54..a2a5e2f9 100644 --- a/apache-httpd-server.configure +++ b/apache-httpd-server.configure @@ -19,5 +19,5 @@ set -e ROOT="$1" -ln -sf "/etc/systemd/system/apache-httpd-server-setup.service" \ - "$ROOT/etc/systemd/system/multi-user.target.wants/apache-httpd-server-setup.service" +ln -sf "/etc/systemd/system/apache-httpd.service" \ + "$ROOT/etc/systemd/system/multi-user.target.wants/apache-httpd.service" diff --git a/openstack/etc/systemd/system/apache-httpd.service b/openstack/etc/systemd/system/apache-httpd.service new file mode 100644 index 00000000..967ec71a --- /dev/null +++ b/openstack/etc/systemd/system/apache-httpd.service @@ -0,0 +1,16 @@ +[Unit] +Description=Apache Web Server +Requires=apache-httpd-server-setup.service +After=network.target remote-fs.target nss-lookup.target apache-httpd-server-setup.service + +[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 +PrivateTmp=true +LimitNOFILE=infinity + +[Install] +WantedBy=multi-user.target diff --git a/openstack/manifest b/openstack/manifest index fc8c9c51..a1b0a13d 100644 --- a/openstack/manifest +++ b/openstack/manifest @@ -174,3 +174,4 @@ 0100644 0 0 /etc/systemd/system/postgres-server.service 0100755 0 0 /usr/share/openstack/apache-httpd-server-setup 0100644 0 0 /etc/systemd/system/apache-httpd-server-setup.service +0100644 0 0 /etc/systemd/system/apache-httpd.service diff --git a/openstack/usr/share/openstack/apache-httpd-server-setup b/openstack/usr/share/openstack/apache-httpd-server-setup index 56dcebbd..7b10bd64 100755 --- a/openstack/usr/share/openstack/apache-httpd-server-setup +++ b/openstack/usr/share/openstack/apache-httpd-server-setup @@ -38,3 +38,5 @@ mv -v /usr/bin/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 |