git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #73086 from redvers/httpd-module-enableUserDir-fix

nixos/httpd: module fixes enableUserDir (attendum to #72789)

commit8496f9556c3773ed8b4623335ce890acdcd7d12d authorAaron Andersen <aaron@fosslib.net> dateFri 8 Nov 2019, 20:36 (7 years ago) parenta1c3a7f62e421f
1 file changed+3
nixos/modules/services/web-servers/apache-httpd/default.nix+3
nixos/modules/services/web-servers/apache-httpd/default.nix+3
@@ -33,6 +33,8 @@ let
3333
3434 enableSSL = any (vhost: vhost.enableSSL) allHosts;
3535
36+ enableUserDir = any (vhost: vhost.enableUserDir) allHosts;
37+
3638 # NOTE: generally speaking order of modules is very important
3739 modules =
3840 [ # required apache modules our httpd service cannot run without
@@ -45,6 +47,7 @@ let
4547 ]
4648 ++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ])
4749 ++ optional enableSSL "ssl"
50+ ++ optional enableUserDir "userdir"
4851 ++ optional mainCfg.enableMellon { name = "auth_mellon"; path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so"; }
4952 ++ optional mainCfg.enablePHP { name = "php${phpMajorVersion}"; path = "${php}/modules/libphp${phpMajorVersion}.so"; }
5053 ++ optional mainCfg.enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; }