diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2012-11-28 22:17:09 +0000 |
|---|---|---|
| committer | Eric Bénard <eric@eukrea.com> | 2013-02-01 09:59:00 +0100 |
| commit | 165540cf6add37f0046ff195417d060748cd4550 (patch) | |
| tree | 4ad9659234c432dcdcf772bf19b49e657811705e | |
| parent | 532b121cdd83d70e7e1b1b743fe02a59c7eacdf1 (diff) | |
| download | meta-openembedded-165540cf6add37f0046ff195417d060748cd4550.tar.gz | |
php: add apache configuration for php-fpm
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
| -rw-r--r-- | meta-oe/recipes-devtools/php/php.inc | 8 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/php/php/php-fpm-apache.conf | 6 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/php/php_5.3.19.bb | 1 |
3 files changed, 13 insertions, 2 deletions
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index 7850c1ea5..5e5a087dc 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc @@ -7,7 +7,7 @@ DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ libc-client openssl sqlite3" DEPENDS_virtclass-native = "zlib-native libxml2-native" -INC_PR = "r2" +INC_PR = "r3" SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2" @@ -65,6 +65,8 @@ do_install_append_pn-php() { rm -rf ${D}/.[a-z]* sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}/${sysconfdir}/pear.conf install -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf + install -d ${D}/${sysconfdir}/apache2/conf.d + install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf install -d ${D}${sysconfdir}/init.d sed -i 's:=/usr/sbin:=${sbindir}:g' ${S}/sapi/fpm/init.d.php-fpm sed -i 's:=/etc:=${sysconfdir}:g' ${S}/sapi/fpm/init.d.php-fpm @@ -72,7 +74,7 @@ do_install_append_pn-php() { install -m 0755 ${S}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm } -PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-pear ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}" +PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}" RDEPENDS_${PN}-pear = "${PN}" RDEPENDS_${PN}-cli = "${PN}" @@ -86,7 +88,9 @@ FILES_${PN}-doc += "${libdir}/php/doc" FILES_${PN}-cli = "${bindir}/php" FILES_${PN}-cgi = "${bindir}/php-cgi" FILES_${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm" +FILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" CONFFILES_${PN}-fpm = "${sysconfdir}/php-fpm.conf" +CONFFILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" INITSCRIPT_NAME_${PN}-fpm = "php-fpm" INITSCRIPT_PARAMS_${PN}-fpm = "defaults 60" FILES_${PN}-pear = "${bindir}/pear* ${bindir}/pecl ${libdir}/php/PEAR \ diff --git a/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf b/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf new file mode 100644 index 000000000..77cdd82a7 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf @@ -0,0 +1,6 @@ +# Taken from http://wiki.apache.org/httpd/PHP-FPM + +LoadModule proxy_module lib/apache2/modules/mod_proxy.so +LoadModule proxy_fcgi_module lib/apache2/modules/mod_proxy_fcgi.so + +ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/usr/share/apache2/htdocs/ diff --git a/meta-oe/recipes-devtools/php/php_5.3.19.bb b/meta-oe/recipes-devtools/php/php_5.3.19.bb index 27baa1d79..8204104b7 100644 --- a/meta-oe/recipes-devtools/php/php_5.3.19.bb +++ b/meta-oe/recipes-devtools/php/php_5.3.19.bb @@ -15,6 +15,7 @@ SRC_URI_append_pn-php += "file://iconv.patch \ file://php_exec_native.patch \ file://fix-fpm-cross-compile.patch \ file://php-fpm.conf \ + file://php-fpm-apache.conf \ " SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4" |