diff options
| author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-01-13 09:29:01 +0000 |
|---|---|---|
| committer | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-01-22 12:46:30 +0000 |
| commit | 4bfee8b106cfb0d8151c3322227b36282a0dbf30 (patch) | |
| tree | 3852cbdabe51f79f057239ff8bb3fd9e7efbe0ce /openstack | |
| parent | c763824af2c4c0e0fd81f2d0c6aba34991a3784d (diff) | |
| download | definitions-4bfee8b106cfb0d8151c3322227b36282a0dbf30.tar.gz | |
Add initial apache setup
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/etc/systemd/system/apache-httpd-server-setup.service | 12 | ||||
| -rw-r--r-- | openstack/manifest | 2 | ||||
| -rwxr-xr-x | openstack/usr/share/openstack/apache-httpd-server-setup | 40 |
3 files changed, 54 insertions, 0 deletions
diff --git a/openstack/etc/systemd/system/apache-httpd-server-setup.service b/openstack/etc/systemd/system/apache-httpd-server-setup.service new file mode 100644 index 00000000..23906d55 --- /dev/null +++ b/openstack/etc/systemd/system/apache-httpd-server-setup.service @@ -0,0 +1,12 @@ +[Unit] +Description=Run apache-httpd-server-setup (once) +Requires=local-fs.target +After=local-fs.target + +[Service] +Type=oneshot +ExecStart=/usr/share/openstack/apache-httpd-server-setup +Restart=no + +[Install] +WantedBy=multi-user.target diff --git a/openstack/manifest b/openstack/manifest index a2d79412..fc8c9c51 100644 --- a/openstack/manifest +++ b/openstack/manifest @@ -172,3 +172,5 @@ 0100755 0 0 /usr/share/openstack/postgres-setup 0100644 0 0 /etc/systemd/system/postgres-setup.service 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 diff --git a/openstack/usr/share/openstack/apache-httpd-server-setup b/openstack/usr/share/openstack/apache-httpd-server-setup new file mode 100755 index 00000000..56dcebbd --- /dev/null +++ b/openstack/usr/share/openstack/apache-httpd-server-setup @@ -0,0 +1,40 @@ +#!/bin/sh +# +# Copyright (C) 2015 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# +# This is a "morph deploy" configuration extension to enable bash +# as default shell in gerrit systems. +set -e + +############################################################################### +# 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 +groupadd -r apache +useradd -c "Apache Server" -d /srv/www -g apache \ + -s /bin/false apache + +############################################################################### +# Move suexec to the directory where apache is configured to have it # +# Check configure in strata/apache-httpd-server/httpd-server.morph # +############################################################################### +mkdir -p /usr/lib/httpd +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 |