Merge with Zash
authorMatthew Wild <mwild1@gmail.com>
Sun, 22 Apr 2012 19:03:50 +0100
changeset 4657 281596cc53d3
parent 4655 9159546cb2f3 (current diff)
parent 4656 43469a2d124d (diff)
child 4658 de04897cb8fe
Merge with Zash
--- a/core/certmanager.lua	Sun Apr 22 16:35:26 2012 +0100
+++ b/core/certmanager.lua	Sun Apr 22 19:03:50 2012 +0100
@@ -35,7 +35,7 @@
 		mode = mode;
 		protocol = user_ssl_config.protocol or "sslv23";
 		key = resolve_path(config_path, user_ssl_config.key);
-		password = user_ssl_config.password;
+		password = user_ssl_config.password or function() log("error", "Encrypted certificate for %s requires 'ssl' 'password' to be set in config", host); end;
 		certificate = resolve_path(config_path, user_ssl_config.certificate);
 		capath = resolve_path(config_path, user_ssl_config.capath or default_capath);
 		cafile = resolve_path(config_path, user_ssl_config.cafile);