diff options
| author |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-08-22 16:04:49 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-08-22 16:05:04 -0400 |
| commit | bf5bf7c6356c6771b3ff1849bf606bb1c5b18a43 (patch) | |
| tree | 415ad7dfd1db3860f0d30be976e341b904d96d2a /meta-openstack | |
| parent | 0d96f4e563f84528aa70c3e67ca081c817dc59e8 (diff) | |
| download | meta-cloud-services-bf5bf7c6356c6771b3ff1849bf606bb1c5b18a43.tar.gz meta-cloud-services-bf5bf7c6356c6771b3ff1849bf606bb1c5b18a43.tar.bz2 meta-cloud-services-bf5bf7c6356c6771b3ff1849bf606bb1c5b18a43.zip | |
apache: resync to oe-core latest
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack')
| -rw-r--r-- | meta-openstack/recipes-dangling/apache2/apache2_2.4.10.bbappend (renamed from meta-openstack/recipes-extended/apache2/apache2_2.4.9.bbappend) | 0 | ||||
| -rw-r--r-- | meta-openstack/recipes-dangling/apache2/apache2_2.4.9.bbappend | 15 |
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 7aca867a..7aca867a 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 00000000..7aca867a --- /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" |