apache: resync to oe-core latest

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

2 files changed, 15 insertions, 0 deletions

diff --git a/meta-openstack/recipes-extended/apache2/apache2_2.4.9.bbappend b/meta-openstack/recipes-dangling/apache2/apache2_2.4.10.bbappend
index 7aca867..7aca867 100644
--- a/meta-openstack/recipes-extended/apache2/apache2_2.4.9.bbappend
+++ b/meta-openstack/recipes-dangling/apache2/apache2_2.4.10.bbappend
diff --git a/meta-openstack/recipes-dangling/apache2/apache2_2.4.9.bbappend b/meta-openstack/recipes-dangling/apache2/apache2_2.4.9.bbappend
new file mode 100644
index 0000000..7aca867
--- /dev/null
+++ b/meta-openstack/recipes-dangling/apache2/apache2_2.4.9.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"