prosody
a927edfb54ab
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

prosodyctl @ 7214:a927edfb54ab

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 28 Feb 2016 18:47:32 +0100
parent 7211:117f4a627813
parent 7213:193e4c65d218
child 7251:b74421fe417a
line wrap: on
line diff
--- a/prosodyctl	Sun Feb 28 18:25:16 2016 +0100
+++ b/prosodyctl	Sun Feb 28 18:47:32 2016 +0100
@@ -1223,7 +1223,7 @@
 					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 @@
 							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