apache: resync to oe-core latest

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

1 files changed, 0 insertions, 15 deletions

diff --git a/meta-openstack/recipes-extended/apache2/apache2_2.4.9.bbappend b/meta-openstack/recipes-extended/apache2/apache2_2.4.9.bbappend
deleted file mode 100644
index 7aca867..0000000
--- a/meta-openstack/recipes-extended/apache2/apache2_2.4.9.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-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"