summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Berg <chexxor@gmail.com>2013-11-11 12:08:36 +0800
committerAlex Berg <chexxor@gmail.com>2013-11-11 12:08:36 +0800
commitdf5f4918937d9285eabb862bd0276a87316d8917 (patch)
tree1ed1d7ee4c191775d12333f175ae597d1f086003
parent0427e7fbf236ca20e9311399dd3e7d369e6a99c6 (diff)
downloadnixlib-df5f4918937d9285eabb862bd0276a87316d8917.tar
nixlib-df5f4918937d9285eabb862bd0276a87316d8917.tar.gz
nixlib-df5f4918937d9285eabb862bd0276a87316d8917.tar.bz2
nixlib-df5f4918937d9285eabb862bd0276a87316d8917.tar.lz
nixlib-df5f4918937d9285eabb862bd0276a87316d8917.tar.xz
nixlib-df5f4918937d9285eabb862bd0276a87316d8917.tar.zst
nixlib-df5f4918937d9285eabb862bd0276a87316d8917.zip
Add HTTPD SSH assertion to check null cert/key.
-rw-r--r--nixos/modules/services/web-servers/apache-httpd/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index e94af76661d1..6836746f8297 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -584,8 +584,8 @@ in
   config = mkIf config.services.httpd.enable {
   
     assertions = [ { assertion = mainCfg.enableSSL == true
-                               -> mainCfg.sslServerCert != null && mainCfg.sslServerCert != ""
-                                    && mainCfg.sslServerKey != null && mainCfg.sslServerKey != "";
+                               -> mainCfg.sslServerCert != null
+                                    && mainCfg.sslServerKey != null;
                      message = "SSL is enabled for HTTPD, but sslServerCert and/or sslServerKey haven't been specified."; }
                  ];