diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2019-09-10 17:58:23 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-09-10 06:54:01 -0700 |
commit | 54983c1351ef12d6fa0ef1a61ed6a6b3a4087951 (patch) | |
tree | 2b09a03a3c6a38da4e2507486031ef5e1872af67 /meta-oe/recipes-devtools | |
parent | 571759121373f2c3ff581fcf0c4a080c52f84484 (diff) | |
download | meta-openembedded-54983c1351ef12d6fa0ef1a61ed6a6b3a4087951.tar.gz |
php: fix module path in mod_php.conf
The apache2 module's path has been changed from ${libdir} to
${libexecdir} in commit 8d4d608b4e937bb3b8e3b260bd75338c3ff7e8fd. Update
mod_php.conf to adapt it.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools')
-rw-r--r-- | meta-oe/recipes-devtools/php/php.inc | 2 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/php/php/php-fpm-apache.conf | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index 23380da2c..4cae3f7da 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc | |||
@@ -178,7 +178,7 @@ do_install_append_class-target() { | |||
178 | install -d ${D}${sysconfdir}/apache2/modules.d | 178 | install -d ${D}${sysconfdir}/apache2/modules.d |
179 | install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} | 179 | install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} |
180 | install -m 644 ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d | 180 | install -m 644 ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d |
181 | sed -i s,lib/,${libdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf | 181 | sed -i s,lib/,${libexecdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf |
182 | cat ${S}/php.ini-production | \ | 182 | cat ${S}/php.ini-production | \ |
183 | sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \ | 183 | sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \ |
184 | > ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION}/php.ini | 184 | > ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION}/php.ini |
diff --git a/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf b/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf index ef79a0cc9..f7f46d205 100644 --- a/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf +++ b/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | # Taken from http://wiki.apache.org/httpd/PHP-FPM | 1 | # Taken from http://wiki.apache.org/httpd/PHP-FPM |
2 | 2 | ||
3 | LoadModule proxy_module /usr/lib/apache2/modules/mod_proxy.so | 3 | LoadModule proxy_module /usr/libexec/apache2/modules/mod_proxy.so |
4 | LoadModule proxy_fcgi_module /usr/lib/apache2/modules/mod_proxy_fcgi.so | 4 | LoadModule proxy_fcgi_module /usr/libexec/apache2/modules/mod_proxy_fcgi.so |
5 | 5 | ||
6 | ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/usr/share/apache2/htdocs/ | 6 | ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/usr/share/apache2/htdocs/ |