[oe-commits] Eric Bénard : hiawatha: add CONFFILES and a php example
git at git.openembedded.org
git at git.openembedded.org
Tue Nov 27 10:53:12 UTC 2012
Module: meta-openembedded.git
Branch: master
Commit: e4236266b7ac6103e4b9400eb51b5cb0037f3ba9
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=e4236266b7ac6103e4b9400eb51b5cb0037f3ba9
Author: Eric Bénard <eric at eukrea.com>
Date: Sun Nov 25 18:25:10 2012 +0100
hiawatha: add CONFFILES and a php example
- add CONFFILES so that configuration files don't get overwritten
during upgrade
- add an example on how to launch php-cgi using php-fcgi
Signed-off-by: Eric Bénard <eric at eukrea.com>
---
.../recipes-httpd/hiawatha/hiawatha_8.6.bb | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb
index 2e6955e..7dcbe9e 100644
--- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb
+++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb
@@ -4,6 +4,8 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS = "libxml2 libxslt"
+PR = "r1"
+
SECTION = "net"
SRC_URI = "http://hiawatha-webserver.org/files/${PN}-${PV}.tar.gz \
@@ -36,10 +38,20 @@ EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \
-DWORK_DIR=/var/lib/hiawatha "
do_install_append() {
-
# Copy over init script and sed in the correct sbin path
sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init
mkdir -p ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/hiawatha-init ${D}${sysconfdir}/init.d/hiawatha
+ # configure php-fcgi to have a working configuration
+ # by default if php is installed
+ echo "Server = ${bindir}/php-cgi ; 2 ; 127.0.0.1:2005 ; nobody:nobody ; ${sysconfdir}/php/hiawatha-php5/php.ini" >> ${D}${sysconfdir}/hiawatha/php-fcgi.conf
}
+
+CONFFILES_${PN} = " \
+ ${sysconfdir}/hiawatha/cgi-wrapper.conf \
+ ${sysconfdir}/hiawatha/hiawatha.conf \
+ ${sysconfdir}/hiawatha/index.xslt \
+ ${sysconfdir}/hiawatha/mimetype.conf \
+ ${sysconfdir}/hiawatha/php-fcgi.conf \
+ "
More information about the Openembedded-commits
mailing list