diff options
author | Kim Alvefur <zash@zash.se> | 2016-02-28 18:47:32 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-02-28 18:47:32 +0100 |
commit | 6f31f27a762f5f0bda723059e2dfa4c77aadb438 (patch) | |
tree | 45b3d17492ea86ca80f2643bc2d7ac275451deb8 /prosodyctl | |
parent | 14c13de583cf091469350054580311b68c45accc (diff) | |
parent | 147ed8402a59823eda8b794e6bad133766405f42 (diff) | |
download | prosody-6f31f27a762f5f0bda723059e2dfa4c77aadb438.tar.gz prosody-6f31f27a762f5f0bda723059e2dfa4c77aadb438.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
-rwxr-xr-x | prosodyctl | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1223,7 +1223,7 @@ function commands.check(arg) print(" No 'certificate' found for "..host) cert_ok = false elseif not ssl_config.key then - print(" No 'key' found for for "..host) + print(" No 'key' found for "..host) cert_ok = false else local key, err = io.open(ssl_config.key); -- Permissions check only @@ -1248,7 +1248,7 @@ function commands.check(arg) cert_ok = false elseif not cert:validat(os.time() + 86400*7) then print(" Certificate expires within one week.") - elseif not cert:validat(os.time() + 86400*13) then + elseif not cert:validat(os.time() + 86400*31) then print(" Certificate expires within one month.") end if config.get(host, "component_module") == nil |