about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorAustin Seipp <aseipp@pobox.com>2014-06-18 16:08:21 -0500
committerAustin Seipp <aseipp@pobox.com>2014-06-18 16:08:21 -0500
commit91f1dda340cbc91f7bf6a8ba9c6c5d36d5106a27 (patch)
treeb7b98febe894af0236a25a417e114f8d39dfdf60 /nixos/modules
parent4643126d10b59312e992f09345faa68707ea13b3 (diff)
parent35df71ac1df83f05bf58298245a014553330860e (diff)
downloadnixlib-91f1dda340cbc91f7bf6a8ba9c6c5d36d5106a27.tar
nixlib-91f1dda340cbc91f7bf6a8ba9c6c5d36d5106a27.tar.gz
nixlib-91f1dda340cbc91f7bf6a8ba9c6c5d36d5106a27.tar.bz2
nixlib-91f1dda340cbc91f7bf6a8ba9c6c5d36d5106a27.tar.lz
nixlib-91f1dda340cbc91f7bf6a8ba9c6c5d36d5106a27.tar.xz
nixlib-91f1dda340cbc91f7bf6a8ba9c6c5d36d5106a27.tar.zst
nixlib-91f1dda340cbc91f7bf6a8ba9c6c5d36d5106a27.zip
Merge pull request #2980 from bluescreen303/php-fpm
phpfpm: add option for setting php.ini file
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/web-servers/phpfpm.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix
index 4a14f9b41a42..8551e3ccdeb2 100644
--- a/nixos/modules/services/web-servers/phpfpm.nix
+++ b/nixos/modules/services/web-servers/phpfpm.nix
@@ -42,6 +42,12 @@ in {
         '';
       };
 
+      phpIni = mkOption {
+        type = types.path;
+        default = "${cfg.phpPackage}/etc/php-recommended.ini";
+        description = "php.ini file to use.";
+      };
+
       poolConfigs = mkOption {
         type = types.attrsOf types.lines;
         default = {};
@@ -75,7 +81,7 @@ in {
         mkdir -p "${stateDir}"
       '';
       serviceConfig = {
-        ExecStart = "${cfg.phpPackage}/sbin/php-fpm -y ${cfgFile}";
+        ExecStart = "${cfg.phpPackage}/sbin/php-fpm -y ${cfgFile} -c ${cfg.phpIni}";
         PIDFile = pidFile;
       };
     };