Openembedded Devel Discussions
 help / color / mirror / Atom feed
From: "Eric Bénard" <eric@eukrea.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-webserver][PATCH 7/7] hiawatha: add CONFFILES and a php example
Date: Sun, 25 Nov 2012 18:25:10 +0100	[thread overview]
Message-ID: <1353864310-20097-7-git-send-email-eric@eukrea.com> (raw)
In-Reply-To: <1353864310-20097-1-git-send-email-eric@eukrea.com>

- 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@eukrea.com>
---
 meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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 \
+    "
-- 
1.7.11.7




  parent reply	other threads:[~2012-11-26 10:07 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-25 17:25 [meta-webserver][PATCH 1/7] mysql: upgrade to 5.1.66 Eric Bénard
2012-11-25 17:25 ` [meta-webserver][PATCH 2/7] apache2: upgrade to 2.4.3 Eric Bénard
2012-11-25 17:25 ` [meta-webserver][PATCH 3/7] modphp: upgrade to 5.3.19 Eric Bénard
2012-11-25 17:25 ` [meta-webserver][PATCH 4/7] modphp: enable bz2, zip and mbstring Eric Bénard
2012-11-25 17:25 ` [meta-webserver][PATCH 5/7] php: upgrade to 5.3.19 Eric Bénard
2012-11-26 19:28   ` Martin Jansa
2012-11-25 17:25 ` [meta-webserver][PATCH 6/7] php: enable gettext and sqlite Eric Bénard
2012-11-25 17:25 ` Eric Bénard [this message]
2012-11-26 10:27   ` [meta-webserver][PATCH 7/7] hiawatha: add CONFFILES and a php example Jack Mitchell
2012-11-26 10:30     ` Eric Bénard
2012-11-26 10:45       ` Jack Mitchell
2012-11-26 10:48         ` Eric Bénard
2012-11-27 10:58   ` Paul Eggleton
2012-11-30 10:09 ` [meta-webserver][PATCH 1/7] mysql: upgrade to 5.1.66 Marcin Juszkiewicz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1353864310-20097-7-git-send-email-eric@eukrea.com \
    --to=eric@eukrea.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox