From ab68ccc2a60a7e4a040e505877834eb091346908 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Tue, 8 Jan 2013 21:20:00 +0100
Subject: [PATCH] prosodyctl, prosody.cfg.lua.dist, certs/Makefile: Use .crt as
 suffix for certificates everywhere (thanks jasperixla)

---
 certs/Makefile                          | 6 +++---
 certs/{localhost.cert => localhost.crt} | 0
 prosody.cfg.lua.dist                    | 2 +-
 prosodyctl                              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename certs/{localhost.cert => localhost.crt} (100%)

diff --git a/certs/Makefile b/certs/Makefile
index c5e4294c..f3854c5f 100644
--- a/certs/Makefile
+++ b/certs/Makefile
@@ -1,4 +1,4 @@
-.DEFAULT: localhost.cert
+.DEFAULT: localhost.crt
 keysize=2048
 
 # How to:
@@ -8,7 +8,7 @@ keysize=2048
 # Then `make yourhost.key` to create your private key, you can
 # include keysize=number to change the size of the key.
 # Then you can either `make yourhost.csr` to generate a certificate
-# signing request that you can submit to a CA, or `make yourhost.cert`
+# signing request that you can submit to a CA, or `make yourhost.crt`
 # to generate a self signed certificate.
 
 .PRECIOUS: %.cnf %.key
@@ -18,7 +18,7 @@ keysize=2048
 	openssl req -new -key $(lastword $^) -out $@ -utf8 -config $(firstword $^)
 
 # Self signed
-%.cert: %.cnf %.key
+%.crt: %.cnf %.key
 	openssl req -new -x509 -nodes -key $(lastword $^) -days 365 \
 		-sha1 -out $@ -utf8 -config $(firstword $^)
 
diff --git a/certs/localhost.cert b/certs/localhost.crt
similarity index 100%
rename from certs/localhost.cert
rename to certs/localhost.crt
diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index c0c729a9..9ca9608a 100644
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -89,7 +89,7 @@ allow_registration = false;
 -- to use SSL/TLS, you may comment or remove this
 ssl = {
 	key = "certs/localhost.key";
-	certificate = "certs/localhost.cert";
+	certificate = "certs/localhost.crt";
 }
 
 -- Only allow encrypted streams? Encryption is already used when
diff --git a/prosodyctl b/prosodyctl
index 97232e5c..134624b2 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -723,7 +723,7 @@ end
 
 function cert_commands.generate(arg)
 	if #arg >= 1 and arg[1] ~= "--help" then
-		local cert_filename = (CFG_DATADIR or ".") .. "/" .. arg[1] .. ".cert";
+		local cert_filename = (CFG_DATADIR or ".") .. "/" .. arg[1] .. ".crt";
 		if ask_overwrite(cert_filename) then
 			return nil, cert_filename;
 		end
-- 
2.30.2