php/trunk/php-fpm.patch

   1 --- sapi/fpm/Makefile.frag.orig
   2 +++ sapi/fpm/Makefile.frag
   3 @@ -15,8 +15,8 @@
   4         else \
   5                 echo "Installing PHP FPM defconfig:     $(INSTALL_ROOT)$(sysconfdir)/" && \
   6                 $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
   7 -               $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
   8 -               $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
   9 +               $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
  10 +               $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \
  11         fi
  12
  13         @echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
  14 --- sapi/fpm/php-fpm.conf.in.orig
  15 +++ sapi/fpm/php-fpm.conf.in
  16 @@ -14,14 +14,14 @@
  17  ; Pid file
  18  ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
  19  ; Default Value: none
  20 -;pid = run/php-fpm.pid
  21 +;pid = /run/php-fpm/php-fpm.pid
  22
  23  ; Error log file
  24  ; If it's set to "syslog", log is sent to syslogd instead of being written
  25  ; into a local file.
  26  ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
  27  ; Default Value: log/php-fpm.log
  28 -;error_log = log/php-fpm.log
  29 +error_log = syslog
  30
  31  ; syslog_facility is used to specify what type of program is logging the
  32  ; message. This lets syslogd specify that messages from different facilities
  33 --- sapi/fpm/www.conf.in.orig
  34 +++ sapi/fpm/www.conf.in
  35 @@ -38,7 +38,7 @@
  36  ;                            (IPv6 and IPv4-mapped) on a specific port;
  37  ;   '/path/to/unix/socket' - to listen on a unix socket.
  38  ; Note: This value is mandatory.
  39 -listen = 127.0.0.1:9000
  40 +listen = /run/php-fpm/php-fpm.sock
  41
  42  ; Set listen(2) backlog.
  43  ; Default Value: 511 (-1 on Linux, FreeBSD and OpenBSD)
  44 @@ -50,8 +50,8 @@
  45  ; and group can be specified either by name or by their numeric IDs.
  46  ; Default Values: Owner is set to the master process running user. If the group
  47  ;                 is not set, the owner's group is used. Mode is set to 0660.
  48 -;listen.owner = @php_fpm_user@
  49 -;listen.group = @php_fpm_group@
  50 +listen.owner = @php_fpm_user@
  51 +listen.group = @php_fpm_group@
  52  ;listen.mode = 0660
  53
  54  ; When POSIX Access Control Lists are supported you can set them using
  55 @@ -422,7 +422,7 @@
  56  ; Chdir to this directory at the start.
  57  ; Note: relative path can be used.
  58  ; Default Value: current directory or / when chroot
  59 -;chdir = /var/www
  60 +;chdir = /srv/http
  61
  62  ; Redirect worker stdout and stderr into main error log. If not set, stdout and
  63  ; stderr will be redirected to /dev/null according to FastCGI specs.
  64 --- sapi/fpm/php-fpm.service.in.orig
  65 +++ sapi/fpm/php-fpm.service.in
  66 @@ -8,7 +8,7 @@
  67
  68  [Service]
  69  Type=@php_fpm_systemd@
  70 -PIDFile=@EXPANDED_LOCALSTATEDIR@/run/php-fpm.pid
  71 +PIDFile=/run/php-fpm/php-fpm.pid
  72  ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf
  73  ExecReload=/bin/kill -USR2 $MAINPID
  74