diff options
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/editors/emacs.xml | 2 | ||||
| -rw-r--r-- | nixos/modules/services/web-servers/phpfpm/default.nix | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 618460953a17..544e4a1076f4 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -72,7 +72,7 @@ <term><varname>emacs25-nox</varname></term> <listitem> <para> - Emacs 24 built without any dependency on X11 + Emacs 25 built without any dependency on X11 libraries. </para> </listitem> diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index a3a23b222fbb..787eed1c0ca4 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -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; }; }; |