diff options
| author | Red Davies <red@infect.me> | 2019-11-09 00:53:56 +0000 |
|---|---|---|
| committer | Red Davies <red@infect.me> | 2019-11-09 00:53:56 +0000 |
| commit | 62e421fbb2fcd9ba343cd7d73009a834c5d7d669 (patch) | |
| tree | e288162686b00a153621f2f86a414e509be24b05 /nixos/modules/services/web-servers/apache-httpd/default.nix | |
| parent | a1c3a7fa24acb3500bbbd9f201ef19df507195b2 (diff) | |
| download | nixpkgs-62e421fbb2fcd9ba343cd7d73009a834c5d7d669.tar nixpkgs-62e421fbb2fcd9ba343cd7d73009a834c5d7d669.tar.gz nixpkgs-62e421fbb2fcd9ba343cd7d73009a834c5d7d669.tar.bz2 nixpkgs-62e421fbb2fcd9ba343cd7d73009a834c5d7d669.tar.lz nixpkgs-62e421fbb2fcd9ba343cd7d73009a834c5d7d669.tar.xz nixpkgs-62e421fbb2fcd9ba343cd7d73009a834c5d7d669.tar.zst nixpkgs-62e421fbb2fcd9ba343cd7d73009a834c5d7d669.zip | |
nixos/httpd: module fixes enableUserDir (attendum to #72789)
Diffstat (limited to 'nixos/modules/services/web-servers/apache-httpd/default.nix')
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 3c5918baa53..f5a6051b4b5 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -33,6 +33,8 @@ let enableSSL = any (vhost: vhost.enableSSL) allHosts; + enableUserDir = any (vhost: vhost.enableUserDir) allHosts; + # NOTE: generally speaking order of modules is very important modules = [ # required apache modules our httpd service cannot run without @@ -45,6 +47,7 @@ let ] ++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ]) ++ optional enableSSL "ssl" + ++ optional enableUserDir "userdir" ++ optional mainCfg.enableMellon { name = "auth_mellon"; path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so"; } ++ optional mainCfg.enablePHP { name = "php${phpMajorVersion}"; path = "${php}/modules/libphp${phpMajorVersion}.so"; } ++ optional mainCfg.enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; } |