diff options
author | Rob Vermaas <rob.vermaas@gmail.com> | 2014-01-27 12:34:42 -0800 |
---|---|---|
committer | Rob Vermaas <rob.vermaas@gmail.com> | 2014-01-27 12:34:42 -0800 |
commit | 4ccd60af004f2d53d436cc6eade9bd11039c80e8 (patch) | |
tree | 7e17b0f7403ba3cc9fe22152498138bd97af2b0f /nixos/modules/services/web-servers/apache-httpd/default.nix | |
parent | 4791ee90199a7942260b51868f706e8f173acab8 (diff) | |
parent | da654ed9a0eb03eb4b861130ca417de80c864792 (diff) | |
download | nixlib-4ccd60af004f2d53d436cc6eade9bd11039c80e8.tar nixlib-4ccd60af004f2d53d436cc6eade9bd11039c80e8.tar.gz nixlib-4ccd60af004f2d53d436cc6eade9bd11039c80e8.tar.bz2 nixlib-4ccd60af004f2d53d436cc6eade9bd11039c80e8.tar.lz nixlib-4ccd60af004f2d53d436cc6eade9bd11039c80e8.tar.xz nixlib-4ccd60af004f2d53d436cc6eade9bd11039c80e8.tar.zst nixlib-4ccd60af004f2d53d436cc6eade9bd11039c80e8.zip |
Merge pull request #1178 from chexxor/fix-httpd-ssh
HTTPD: Check for SSL Cert value before building with SSL support.
Diffstat (limited to 'nixos/modules/services/web-servers/apache-httpd/default.nix')
-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 cdb42fa7308a..2552ec18bb92 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -260,7 +260,7 @@ let '' else ""} - ${if cfg.globalRedirect != null then '' + ${if cfg.globalRedirect != null && cfg.globalRedirect != "" then '' RedirectPermanent / ${cfg.globalRedirect} '' else ""} @@ -582,6 +582,12 @@ in ###### implementation config = mkIf config.services.httpd.enable { + + assertions = [ { assertion = mainCfg.enableSSL == true + -> mainCfg.sslServerCert != null + && mainCfg.sslServerKey != null; + message = "SSL is enabled for HTTPD, but sslServerCert and/or sslServerKey haven't been specified."; } + ]; users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") singleton { name = "wwwrun"; |