diff options
| author | Rickard Nilsson <rickynils@gmail.com> | 2014-03-12 11:45:31 +0100 |
|---|---|---|
| committer | Rickard Nilsson <rickynils@gmail.com> | 2014-03-12 11:45:31 +0100 |
| commit | 4e2357313811f486a5c61aafeab5718e3c04f24b (patch) | |
| tree | 03c9245499001580d69149f540e1220fe741c842 /nixos/modules/services/web-servers | |
| parent | 562a8ca4a287fb88476496d663864f0746f34d2f (diff) | |
| download | nixlib-4e2357313811f486a5c61aafeab5718e3c04f24b.tar nixlib-4e2357313811f486a5c61aafeab5718e3c04f24b.tar.gz nixlib-4e2357313811f486a5c61aafeab5718e3c04f24b.tar.bz2 nixlib-4e2357313811f486a5c61aafeab5718e3c04f24b.tar.lz nixlib-4e2357313811f486a5c61aafeab5718e3c04f24b.tar.xz nixlib-4e2357313811f486a5c61aafeab5718e3c04f24b.tar.zst nixlib-4e2357313811f486a5c61aafeab5718e3c04f24b.zip | |
phpfpm module: Make extraConfig and poolConfigs mergeable by switching option type to types.lines
Diffstat (limited to 'nixos/modules/services/web-servers')
| -rw-r--r-- | nixos/modules/services/web-servers/phpfpm.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix index 9be8390fb6ab..76ec41244627 100644 --- a/nixos/modules/services/web-servers/phpfpm.nix +++ b/nixos/modules/services/web-servers/phpfpm.nix @@ -24,7 +24,7 @@ in { options = { services.phpfpm = { extraConfig = mkOption { - type = types.str; + type = types.lines; default = ""; description = '' Extra configuration that should be put in the global section of @@ -36,7 +36,7 @@ in { }; poolConfigs = mkOption { - type = types.attrsOf types.str; + type = types.attrsOf types.lines; default = {}; example = { mypool = '' |