diff options
| author | Kim Alvefur <zash@zash.se> | 2014-04-14 23:41:26 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-04-14 23:41:26 +0200 |
| commit | a0daf05646300692a3a3a71b1011f35df32fe01f (patch) | |
| tree | 32cb9e8ea06f7afd86bc94743b859bae8b539bd9 | |
| parent | c2da2e47e19128f797ddc37c3d1167adef3af875 (diff) | |
| download | prosody-a0daf05646300692a3a3a71b1011f35df32fe01f.tar.gz prosody-a0daf05646300692a3a3a71b1011f35df32fe01f.zip | |
certmanager: Wrap long line and add comment
| -rw-r--r-- | core/certmanager.lua | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index 879d6131..5cbec241 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -81,7 +81,11 @@ function create_context(host, mode, user_ssl_config) user_ssl_config[option] = default_value; end end - user_ssl_config.password = user_ssl_config.password or function() log("error", "Encrypted certificate for %s requires 'ssl' 'password' to be set in config", host); end; + + -- We can't read the password interactively when daemonized + user_ssl_config.password = user_ssl_config.password or + function() log("error", "Encrypted certificate for %s requires 'ssl' 'password' to be set in config", host); end; + for option in pairs(path_options) do if type(user_ssl_config[option]) == "string" then user_ssl_config[option] = resolve_path(config_path, user_ssl_config[option]); |