diff options
Diffstat (limited to 'recipes-devtools/php')
| -rw-r--r-- | recipes-devtools/php/files/init.d.php-rpm.patch | 36 | ||||
| -rw-r--r-- | recipes-devtools/php/files/php-fpm.conf.patch | 30 | ||||
| -rw-r--r-- | recipes-devtools/php/files/php-fpm.default | 2 | ||||
| -rw-r--r-- | recipes-devtools/php/php_%.bbappend | 13 |
4 files changed, 0 insertions, 81 deletions
diff --git a/recipes-devtools/php/files/init.d.php-rpm.patch b/recipes-devtools/php/files/init.d.php-rpm.patch deleted file mode 100644 index 312f5d7..0000000 --- a/recipes-devtools/php/files/init.d.php-rpm.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naru old/sapi/fpm/init.d.php-fpm.in new/sapi/fpm/init.d.php-fpm.in ---- old/sapi/fpm/init.d.php-fpm.in 2017-08-14 16:30:30.551436717 -0500 -+++ new/sapi/fpm/init.d.php-fpm.in 2017-08-14 16:51:21.963399670 -0500 -@@ -10,12 +10,13 @@ - # Description: starts the PHP FastCGI Process Manager daemon - ### END INIT INFO - --prefix=@prefix@ --exec_prefix=@exec_prefix@ -- --php_fpm_BIN=@sbindir@/php-fpm --php_fpm_CONF=@sysconfdir@/php-fpm.conf --php_fpm_PID=@localstatedir@/run/php-fpm.pid -+NAME="php-fpm" -+prefix=/usr -+exec_prefix=/usr -+ -+php_fpm_BIN=/usr/sbin/php-fpm -+php_fpm_CONF=/etc/php-fpm.conf -+php_fpm_PID=/var/run/php-fpm.pid - - - php_opts="--fpm-config $php_fpm_CONF --pid $php_fpm_PID" -@@ -52,6 +53,12 @@ - - case "$1" in - start) -+ [[ -f /etc/default/$NAME ]] && . /etc/default/"$NAME" -+ if [[ $ENABLED != "yes" ]]; then -+ echo "$NAME: disabled in /etc/default" -+ exit -+ fi -+ - echo -n "Starting php-fpm " - - $php_fpm_BIN --daemonize $php_opts diff --git a/recipes-devtools/php/files/php-fpm.conf.patch b/recipes-devtools/php/files/php-fpm.conf.patch deleted file mode 100644 index 6125b67..0000000 --- a/recipes-devtools/php/files/php-fpm.conf.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naru old/php-fpm.conf new/php-fpm.conf ---- old/php-fpm.conf 2017-06-21 12:52:47.597947428 -0500 -+++ new/php-fpm.conf 2017-06-21 13:10:03.225916769 -0500 -@@ -22,7 +22,7 @@ - ; Pid file - ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ - ; Default Value: none --;pid = run/php-fpm.pid -+pid = run/php-fpm.pid - - ; Error log file - ; If it's set to "syslog", log is sent to syslogd instead of being written -@@ -161,7 +161,7 @@ - ; (IPv6 and IPv4-mapped) on a specific port; - ; '/path/to/unix/socket' - to listen on a unix socket. - ; Note: This value is mandatory. --listen = 127.0.0.1:9000 -+listen = /var/run/php-fpm.socket - - ; Set listen(2) backlog. - ; Default Value: 65535 (-1 on FreeBSD and OpenBSD) -@@ -476,7 +476,7 @@ - ; Chdir to this directory at the start. - ; Note: relative path can be used. - ; Default Value: current directory or / when chroot --;chdir = /var/www -+;chdir = /www - - ; Redirect worker stdout and stderr into main error log. If not set, stdout and - ; stderr will be redirected to /dev/null according to FastCGI specs. diff --git a/recipes-devtools/php/files/php-fpm.default b/recipes-devtools/php/files/php-fpm.default deleted file mode 100644 index 0f92640..0000000 --- a/recipes-devtools/php/files/php-fpm.default +++ /dev/null @@ -1,2 +0,0 @@ -# set to "yes" or "no" to control starting on boot -ENABLED="no" diff --git a/recipes-devtools/php/php_%.bbappend b/recipes-devtools/php/php_%.bbappend deleted file mode 100644 index 004c0f8..0000000 --- a/recipes-devtools/php/php_%.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -SRC_URI_append_class-target += "file://php-fpm.conf.patch;patchdir=.. \ - file://init.d.php-rpm.patch \ - file://php-fpm.default \ - " - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -do_install_append_class-target() { - install -d ${D}/${sysconfdir}/default - install -m 0644 ${WORKDIR}/php-fpm.default ${D}/${sysconfdir}/default/php-fpm -} - -FILES_${PN}-fpm += "${sysconfdir}/default"
\ No newline at end of file |
