8 files changed, 22 insertions, 0 deletions

diff --git a/meta-openstack/recipes-extended/apache2/apache2_2.4.7.bbappend b/meta-openstack/recipes-dangling/apache2/apache2_2.4.7.bbappend
index 7aca867..7aca867 100644
--- a/meta-openstack/recipes-extended/apache2/apache2_2.4.7.bbappend
+++ b/meta-openstack/recipes-dangling/apache2/apache2_2.4.7.bbappend
diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.12.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.12.0.bbappend
index 34ad5b8..34ad5b8 100644
--- a/meta-openstack/recipes-support/iproute2/iproute2_3.12.0.bbappend
+++ b/meta-openstack/recipes-dangling/iproute2/iproute2_3.12.0.bbappend
diff --git a/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.30.bbappend b/meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.30.bbappend
index 50fab9f..50fab9f 100644
--- a/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.30.bbappend
+++ b/meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.30.bbappend
diff --git a/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend b/meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.33.bbappend
index 50fab9f..50fab9f 100644
--- a/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend
+++ b/meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.33.bbappend
diff --git a/meta-openstack/recipes-extended/apache2/apache2_2.4.9.bbappend b/meta-openstack/recipes-extended/apache2/apache2_2.4.9.bbappend
new file mode 100644
index 0000000..7aca867
--- /dev/null
+++ b/meta-openstack/recipes-extended/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/lighttpd/lighttpd_1.4.35.bbappend b/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.35.bbappend
new file mode 100644
index 0000000..50fab9f
--- /dev/null
+++ b/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.35.bbappend
@@ -0,0 +1,5 @@
+INC := "${@int(PRINC) + 1}"
+
+do_install_append() {
+        sed -i '2i port=`grep "^server.port" /etc/lighttpd.conf`; if [ -z $port ]; then echo "server port not configured, not running lighttpd..."; exit 0; fi' ${D}/etc/init.d/lighttpd
+}
diff --git a/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.63.bbappend b/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.68.bbappend
index 52eab54..52eab54 100644
--- a/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.63.bbappend
+++ b/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.68.bbappend
diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.14.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.14.0.bbappend
new file mode 100644
index 0000000..34ad5b8
--- /dev/null
+++ b/meta-openstack/recipes-support/iproute2/iproute2_3.14.0.bbappend
@@ -0,0 +1,2 @@
+RRECOMMENDS_${PN} += "kernel-module-veth \
+        "