diff --git a/system/options.nix b/system/options.nix index 7ebe9217ee32..bbbd2c06a2a4 100644 --- a/system/options.nix +++ b/system/options.nix @@ -588,7 +588,7 @@ { name = ["services" "httpd" "extraSubservices" "services"]; - default = false; + default = []; description = " Extra subservices to enable in the webserver. "; diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix index 59f08898cffb..d39a8206324e 100644 --- a/upstart-jobs/httpd.nix +++ b/upstart-jobs/httpd.nix @@ -19,7 +19,6 @@ let logDir = getCfg "logDir"; stateDir = getCfg "stateDir"; enableSSL = false; - webServer = import ../services/apache-httpd { inherit (pkgs) stdenv apacheHttpd coreutils; @@ -56,8 +55,9 @@ let ) ++ - (optional (getCfgs ["extraSubservices" "enable"]) ( - (getCfgs ["extraSubservices" "services"]) webServer pkgs + (optional (getCfgs ["extraSubservices" "enable"]) + (map (service : service webServer pkgs) + (getCfgs ["extraSubservices" "services"]) ) ) ;