Merge 0.10->trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/prosodyctl b/prosodyctl
index 992aa100..ef62a9d8 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -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