Merge pull request #19264 from peterhoeg/php

php fpm: add systemd support
This commit is contained in:
Domen Kožar 2016-10-05 17:36:39 +02:00 committed by GitHub
commit 92d2416280
2 changed files with 7 additions and 9 deletions

View file

@ -7,8 +7,6 @@ let
stateDir = "/run/phpfpm";
pidFile = "${stateDir}/phpfpm.pid";
mkPool = n: p: ''
[${n}]
listen = ${p.listen}
@ -17,9 +15,8 @@ let
cfgFile = pkgs.writeText "phpfpm.conf" ''
[global]
pid = ${pidFile}
error_log = syslog
daemonize = yes
daemonize = no
${cfg.extraConfig}
${concatStringsSep "\n" (mapAttrsToList mkPool cfg.pools)}
@ -43,7 +40,7 @@ in {
description = ''
Extra configuration that should be put in the global section of
the PHP-FPM configuration file. Do not specify the options
<literal>pid</literal>, <literal>error_log</literal> or
<literal>error_log</literal> or
<literal>daemonize</literal> here, since they are generated by
NixOS.
'';
@ -129,8 +126,8 @@ in {
mkdir -p "${stateDir}"
'';
serviceConfig = {
Type = "notify";
ExecStart = "${cfg.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}";
PIDFile = pidFile;
};
};

View file

@ -2,7 +2,7 @@
, mysql, libxml2, readline, zlib, curl, postgresql, gettext
, openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
, uwimap, pam, gmp, apacheHttpd, libiconv }:
, uwimap, pam, gmp, apacheHttpd, libiconv, systemd }:
let
@ -19,11 +19,12 @@ let
enableParallelBuilding = true;
buildInputs = [ flex bison pkgconfig ];
buildInputs = [ flex bison pkgconfig systemd ];
configureFlags = [
"EXTENSION_DIR=$(out)/lib/php/extensions"
] ++ lib.optional stdenv.isDarwin "--with-iconv=${libiconv}";
] ++ lib.optional stdenv.isDarwin "--with-iconv=${libiconv}"
++ lib.optional stdenv.isLinux "--with-fpm-systemd";
flags = {