From bf5bf7c6356c6771b3ff1849bf606bb1c5b18a43 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 22 Aug 2014 16:04:49 -0400 Subject: apache: resync to oe-core latest Signed-off-by: Bruce Ashfield --- .../recipes-dangling/apache2/apache2_2.4.10.bbappend | 15 +++++++++++++++ .../recipes-dangling/apache2/apache2_2.4.9.bbappend | 15 +++++++++++++++ .../recipes-extended/apache2/apache2_2.4.9.bbappend | 15 --------------- 3 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 meta-openstack/recipes-dangling/apache2/apache2_2.4.10.bbappend create mode 100644 meta-openstack/recipes-dangling/apache2/apache2_2.4.9.bbappend delete mode 100644 meta-openstack/recipes-extended/apache2/apache2_2.4.9.bbappend (limited to 'meta-openstack') diff --git a/meta-openstack/recipes-dangling/apache2/apache2_2.4.10.bbappend b/meta-openstack/recipes-dangling/apache2/apache2_2.4.10.bbappend new file mode 100644 index 0000000..7aca867 --- /dev/null +++ b/meta-openstack/recipes-dangling/apache2/apache2_2.4.10.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" 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" 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" -- cgit v1.2.3-54-g00ecf