diff options
| author | Chris Farmiloe <chrisfarms@gmail.com> | 2014-05-20 10:50:39 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-08-03 21:11:45 +0200 |
| commit | 34890e7c2a825d0d43dc4d6d070d706181ae8374 (patch) | |
| tree | 6d7595d0428f4016490745a9b856a27391b5e80e /nixos | |
| parent | c6f9222a225a350712c6e11be7eb7a41fa2452a0 (diff) | |
| download | nixlib-34890e7c2a825d0d43dc4d6d070d706181ae8374.tar nixlib-34890e7c2a825d0d43dc4d6d070d706181ae8374.tar.gz nixlib-34890e7c2a825d0d43dc4d6d070d706181ae8374.tar.bz2 nixlib-34890e7c2a825d0d43dc4d6d070d706181ae8374.tar.lz nixlib-34890e7c2a825d0d43dc4d6d070d706181ae8374.tar.xz nixlib-34890e7c2a825d0d43dc4d6d070d706181ae8374.tar.zst nixlib-34890e7c2a825d0d43dc4d6d070d706181ae8374.zip | |
nixos: Add enablePHP convinence option to services.httpd module to mimic subservices option
Fixes #2699
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 6d0416fbb155..eb3cb75b658e 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -387,7 +387,7 @@ let ''; - enablePHP = any (svc: svc.enablePHP) allSubservices; + enablePHP = mainCfg.enablePHP || any (svc: svc.enablePHP) allSubservices; # Generate the PHP configuration file. Should probably be factored @@ -531,6 +531,12 @@ in ''; }; + enablePHP = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the PHP module."; + }; + phpOptions = mkOption { type = types.lines; default = ""; |