summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/lighttpd
diff options
context:
space:
mode:
authorSteffen Sledz <sledz@dresearch-fe.de>2014-02-11 09:59:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-20 14:28:09 +0000
commitccb0a580956d309e8a501ee956f08fafcc886ea6 (patch)
tree3128f90a4371dd46e93ca98df1bac6ddb38f78ea /meta/recipes-extended/lighttpd
parent39b98e49f277fac39adcbba8f20bed47e0210a8c (diff)
downloadpoky-ccb0a580956d309e8a501ee956f08fafcc886ea6.tar.gz
lighttpd: introduce /etc/lighttpd.d subdir for config file includes
Extend default config file by a directive to include config file fragments from /etc/lighttpd.d. This allows other web application packages to put their configuration there. (From OE-Core rev: 949ef58cf0684147b07745bd1199014ac57b437c) Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/lighttpd')
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd/lighttpd.conf3
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd_1.4.33.bb3
2 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-extended/lighttpd/lighttpd/lighttpd.conf b/meta/recipes-extended/lighttpd/lighttpd/lighttpd.conf
index 3342470cec..6e8402d242 100644
--- a/meta/recipes-extended/lighttpd/lighttpd/lighttpd.conf
+++ b/meta/recipes-extended/lighttpd/lighttpd/lighttpd.conf
@@ -326,3 +326,6 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
326#include_shell "echo var.a=1" 326#include_shell "echo var.a=1"
327## the above is same as: 327## the above is same as:
328#var.a=1 328#var.a=1
329
330# include other config file fragments from lighttpd.d subdir
331include_shell "find /etc/lighttpd.d -maxdepth 1 -name '*.conf' -exec cat {} \;"
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.33.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.33.bb
index 2ddab16498..2ea5f85b15 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.33.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.33.bb
@@ -5,6 +5,7 @@ BUGTRACKER = "http://redmine.lighttpd.net/projects/lighttpd/issues"
5LICENSE = "BSD" 5LICENSE = "BSD"
6LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579" 6LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579"
7 7
8PR = "r1"
8 9
9SECTION = "net" 10SECTION = "net"
10DEPENDS = "zlib libpcre" 11DEPENDS = "zlib libpcre"
@@ -47,7 +48,7 @@ INITSCRIPT_PARAMS = "defaults 70"
47SYSTEMD_SERVICE_${PN} = "lighttpd.service" 48SYSTEMD_SERVICE_${PN} = "lighttpd.service"
48 49
49do_install_append() { 50do_install_append() {
50 install -d ${D}${sysconfdir}/init.d ${D}/www/pages/dav 51 install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav
51 install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d 52 install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
52 install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} 53 install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
53 install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html 54 install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html