cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repair a mismerge in the sample php-fpm.conf file, problem pointed

Browse Source 
out by Jason Tubnor
This commit is contained in:
sthen 2015-04-03 17:53:44 +00:00
parent 224bfed955
commit 29070fe4ee
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lang/php/5.6/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2015/03/21 22:33:01 sthen Exp $
# $OpenBSD: Makefile,v 1.7 2015/04/03 17:53:44 sthen Exp $
BROKEN-hppa = no __sync_bool_compare_and_swap support nor asm fallback
@ -8,6 +8,7 @@ USE_LIBTOOL= No
PV= 5.6
V= ${PV}.7
REVISION-fpm= 0
INI_TEMPLATES= development production

35
lang/php/5.6/patches/patch-sapi_fpm_php-fpm_conf_in
View File

@ -1,19 +1,7 @@
$OpenBSD: patch-sapi_fpm_php-fpm_conf_in,v 1.2 2015/01/23 16:10:28 robert Exp $
--- sapi/fpm/php-fpm.conf.in.orig.port Fri Jan 23 17:05:28 2015
+++ sapi/fpm/php-fpm.conf.in Fri Jan 23 17:06:21 2015
@@ -146,8 +146,9 @@
; Unix user/group of processes
; Note: The user is mandatory. If the group is not set, the default user's group
; will be used.
-user = @php_fpm_user@
-group = @php_fpm_group@
+listen.owner = www
+listen.group = www
+listen.mode = 0660
; The address on which to accept FastCGI requests.
; Valid syntaxes are:
@@ -161,7 +162,7 @@ group = @php_fpm_group@
$OpenBSD: patch-sapi_fpm_php-fpm_conf_in,v 1.3 2015/04/03 17:53:44 sthen Exp $
--- sapi/fpm/php-fpm.conf.in.orig.port Wed Jan 21 00:40:37 2015
+++ sapi/fpm/php-fpm.conf.in Fri Apr 3 18:51:43 2015
@@ -161,7 +161,7 @@ group = @php_fpm_group@
; (IPv6 and IPv4-mapped) on a specific port;
; '/path/to/unix/socket' - to listen on a unix socket.
; Note: This value is mandatory.
@ -22,7 +10,20 @@ $OpenBSD: patch-sapi_fpm_php-fpm_conf_in,v 1.2 2015/01/23 16:10:28 robert Exp $
; Set listen(2) backlog.
; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
@@ -471,7 +472,7 @@ pm.max_spare_servers = 3
@@ -172,9 +172,9 @@ listen = 127.0.0.1:9000
; BSD-derived systems allow connections regardless of permissions.
; Default Values: user and group are set as the running user
; mode is set to 0660
-;listen.owner = @php_fpm_user@
-;listen.group = @php_fpm_group@
-;listen.mode = 0660
+listen.owner = www
+listen.group = www
+listen.mode = 0660
; When POSIX Access Control Lists are supported you can set them using
; these options, value is a comma separated list of user/group names.
; When set, listen.owner and listen.group are ignored
@@ -471,7 +471,7 @@ pm.max_spare_servers = 3
; possible. However, all PHP paths will be relative to the chroot
; (error_log, sessions.save_path, ...).
; Default Value: not set