Skip to content
Permalink
Browse files

Merge pull request #73086 from redvers/httpd-module-enableUserDir-fix

nixos/httpd: module fixes enableUserDir (attendum to #72789)
  • Loading branch information
aanderse committed Nov 9, 2019
2 parents a1c3a7f + 62e421f commit 8496f9556c3773ed8b4623335ce890acdcd7d12d
Showing with 3 additions and 0 deletions.
  1. +3 −0 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"; }

0 comments on commit 8496f95

Please sign in to comment.
You can’t perform that action at this time.