aboutsummaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-extended
diff options
context:
space:
mode:
authorAmy Fong <amy.fong@windriver.com>2014-04-11 09:48:52 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-04-11 13:45:27 -0400
commitcea82c3460ebcbf4506694b606057c2a7f62d271 (patch)
tree33498b769ee1e714e25d6d8ba8779da11e75dde5 /meta-openstack/recipes-extended
parent1efbee3d421996f558333987a10af5ecd9e79bcc (diff)
downloadmeta-cloud-services-cea82c3460ebcbf4506694b606057c2a7f62d271.tar.gz
meta-cloud-services-cea82c3460ebcbf4506694b606057c2a7f62d271.tar.bz2
meta-cloud-services-cea82c3460ebcbf4506694b606057c2a7f62d271.zip
Apache2 changes
Configure apache's ServerName - modify apache2's configuration file for ServerName to 127.0.0.1:80 In 2.4.7, add symlinks for htdocs and log directory to maintain backward compat with older versions. Signed-off-by: Amy Fong <amy.fong@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-extended')
-rw-r--r--meta-openstack/recipes-extended/apache2/apache2_2.4.7.bbappend15
1 files changed, 15 insertions, 0 deletions
diff --git a/meta-openstack/recipes-extended/apache2/apache2_2.4.7.bbappend b/meta-openstack/recipes-extended/apache2/apache2_2.4.7.bbappend
new file mode 100644
index 0000000..7aca867
--- /dev/null
+++ b/meta-openstack/recipes-extended/apache2/apache2_2.4.7.bbappend
@@ -0,0 +1,15 @@
+INC := "${@int(PRINC) + 1}"
+
+do_install_append() {
+ sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf
+
+ # default layout for htdocsdir in 2.4.7 is different, create the following for
+ # backward compatibility reasons
+
+ mkdir -p ${D}${datadir}/${BPN}/default-site
+ ln -sf ../htdocs ${D}${datadir}/${BPN}/default-site/htdocs
+
+ sed -i '30i if [ ! -e /var/log/apache2 ]; then ln -sf /var/apache2/logs/ /var/log/apache2; fi' ${D}/etc/init.d/apache2
+}
+
+FILES_${PN} += "${datadir}/${BPN}/default-site"