# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1456681652 -3600
# Node ID a927edfb54abb7bff3bb3debd417b643ba5fb6b4
# Parent  117f4a627813614a3aac37ba28bef098064e2810# Parent  193e4c65d218b7cd8891a621ee61f78576e4d6b6
Merge 0.10->trunk

diff -r 117f4a627813 -r a927edfb54ab prosodyctl
--- 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