From d911b76ccafeaff97d196a62fb030d6604ee374c Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Fri, 19 Apr 2019 08:26:09 +0800 Subject: apache2: remove bbappend The apache2 in meta-webserver has been upgraded to 2.4.39. This bbappend has been integrated into apache2 recipe. So remove it. Signed-off-by: Yi Zhao Signed-off-by: Bruce Ashfield --- .../recipes-httpd/apache2/apache2_2.4.%.bbappend | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 meta-openstack/recipes-httpd/apache2/apache2_2.4.%.bbappend diff --git a/meta-openstack/recipes-httpd/apache2/apache2_2.4.%.bbappend b/meta-openstack/recipes-httpd/apache2/apache2_2.4.%.bbappend deleted file mode 100644 index 5fc832d..0000000 --- a/meta-openstack/recipes-httpd/apache2/apache2_2.4.%.bbappend +++ /dev/null @@ -1,14 +0,0 @@ -do_install_append() { - sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf - # Keep our logs together, also matches ubuntu and debian - sed -i -e 's@^\(.*\)/var/apache2/logs\(.*\)$@\1/var/log/apache2\2@g' ${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 -} - -FILES_${PN} += "${datadir}/${BPN}/default-site" -SYSTEMD_AUTO_ENABLE_${PN} = "enable" -- cgit v1.2.3-54-g00ecf