diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2019-04-19 08:26:09 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-04-23 16:02:29 -0400 |
commit | d911b76ccafeaff97d196a62fb030d6604ee374c (patch) | |
tree | ccf5219858fb3ed7e5f0d8a06eae40f3fa94c5fb | |
parent | 215b97571f52d43915eda1fdc5cd80719687abcd (diff) | |
download | meta-cloud-services-d911b76ccafeaff97d196a62fb030d6604ee374c.tar.gz |
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 <yi.zhao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r-- | meta-openstack/recipes-httpd/apache2/apache2_2.4.%.bbappend | 14 |
1 files changed, 0 insertions, 14 deletions
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 @@ | |||
1 | do_install_append() { | ||
2 | sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf | ||
3 | # Keep our logs together, also matches ubuntu and debian | ||
4 | sed -i -e 's@^\(.*\)/var/apache2/logs\(.*\)$@\1/var/log/apache2\2@g' ${D}${sysconfdir}/apache2/httpd.conf | ||
5 | |||
6 | # default layout for htdocsdir in 2.4.7 is different, create the following for | ||
7 | # backward compatibility reasons | ||
8 | |||
9 | mkdir -p ${D}${datadir}/${BPN}/default-site | ||
10 | ln -sf ../htdocs ${D}${datadir}/${BPN}/default-site/htdocs | ||
11 | } | ||
12 | |||
13 | FILES_${PN} += "${datadir}/${BPN}/default-site" | ||
14 | SYSTEMD_AUTO_ENABLE_${PN} = "enable" | ||