diff options
author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2015-05-15 01:46:09 -0500 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-22 20:13:32 +0200 |
commit | 2848cc99a18619979a30e30629d2945ae8d09c22 (patch) | |
tree | 37e328725c3de2cfada30ef23afe6828f81668eb /meta-oe/recipes-devtools/php | |
parent | c8ae4dc8ce180bfdf706d98c1501105c97899f5b (diff) | |
download | meta-openembedded-2848cc99a18619979a30e30629d2945ae8d09c22.tar.gz |
php-fpm: Add support for systemd
Adds suport for systemd, creates a service for php-fpm and installs it if required
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/php')
-rw-r--r-- | meta-oe/recipes-devtools/php/php/php-fpm.service | 10 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/php/php_5.5.24.bb | 13 |
2 files changed, 22 insertions, 1 deletions
diff --git a/meta-oe/recipes-devtools/php/php/php-fpm.service b/meta-oe/recipes-devtools/php/php/php-fpm.service new file mode 100644 index 000000000..ac79dc931 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/php-fpm.service | |||
@@ -0,0 +1,10 @@ | |||
1 | [Unit] | ||
2 | Description=PHP-FPM | ||
3 | After=network.target | ||
4 | [Service] | ||
5 | Type=forking | ||
6 | PIDFile=@LOCALSTATEDIR@/run/php-fpm.pid | ||
7 | ExecStart=@SYSCONFDIR@/init.d/php-fpm start | ||
8 | ExecStop=@SYSCONFDIR@/init.d/php-fpm stop | ||
9 | [Install] | ||
10 | WantedBy=multi-user.target | ||
diff --git a/meta-oe/recipes-devtools/php/php_5.5.24.bb b/meta-oe/recipes-devtools/php/php_5.5.24.bb index 76185fbea..3e656af46 100644 --- a/meta-oe/recipes-devtools/php/php_5.5.24.bb +++ b/meta-oe/recipes-devtools/php/php_5.5.24.bb | |||
@@ -27,6 +27,7 @@ SRC_URI_append_class-target += " \ | |||
27 | file://configure.patch \ | 27 | file://configure.patch \ |
28 | file://pthread-check-threads-m4.patch \ | 28 | file://pthread-check-threads-m4.patch \ |
29 | file://70_mod_php5.conf \ | 29 | file://70_mod_php5.conf \ |
30 | file://php-fpm.service \ | ||
30 | " | 31 | " |
31 | 32 | ||
32 | SRC_URI[md5sum] = "f9a8f3e4bb88b33b087bd63732b1402a" | 33 | SRC_URI[md5sum] = "f9a8f3e4bb88b33b087bd63732b1402a" |
@@ -156,6 +157,16 @@ do_install_append_class-target() { | |||
156 | sed -i 's:=/etc:=${sysconfdir}:g' ${B}/sapi/fpm/init.d.php-fpm | 157 | sed -i 's:=/etc:=${sysconfdir}:g' ${B}/sapi/fpm/init.d.php-fpm |
157 | sed -i 's:=/var:=${localstatedir}:g' ${B}/sapi/fpm/init.d.php-fpm | 158 | sed -i 's:=/var:=${localstatedir}:g' ${B}/sapi/fpm/init.d.php-fpm |
158 | install -m 0755 ${B}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm | 159 | install -m 0755 ${B}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm |
160 | install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf | ||
161 | |||
162 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then | ||
163 | install -d ${D}${systemd_unitdir}/system | ||
164 | install -m 0644 ${WORKDIR}/php-fpm.service ${D}${systemd_unitdir}/system/ | ||
165 | sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | ||
166 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ | ||
167 | ${D}${systemd_unitdir}/system/php-fpm.service | ||
168 | fi | ||
169 | |||
159 | TMP=`dirname ${D}/${TMPDIR}` | 170 | TMP=`dirname ${D}/${TMPDIR}` |
160 | while test ${TMP} != ${D}; do | 171 | while test ${TMP} != ${D}; do |
161 | rmdir ${TMP} | 172 | rmdir ${TMP} |
@@ -206,7 +217,7 @@ FILES_${PN}-doc += "${PHP_LIBDIR}/php/doc" | |||
206 | FILES_${PN}-cli = "${bindir}/php" | 217 | FILES_${PN}-cli = "${bindir}/php" |
207 | FILES_${PN}-phar = "${bindir}/phar*" | 218 | FILES_${PN}-phar = "${bindir}/phar*" |
208 | FILES_${PN}-cgi = "${bindir}/php-cgi" | 219 | FILES_${PN}-cgi = "${bindir}/php-cgi" |
209 | FILES_${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm" | 220 | FILES_${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm ${systemd_unitdir}/system/php-fpm.service" |
210 | FILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" | 221 | FILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" |
211 | CONFFILES_${PN}-fpm = "${sysconfdir}/php-fpm.conf" | 222 | CONFFILES_${PN}-fpm = "${sysconfdir}/php-fpm.conf" |
212 | CONFFILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" | 223 | CONFFILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" |