mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

prosodyctl, prosody.cfg.lua.dist, certs/Makefile: Use .crt as suffix for certificates everywhere (thanks jasperixla)

Browse source
This commit is contained in:
Kim Alvefur 2013-01-08 21:20:00 +01:00
parent 2b0081486e
commit 7855128caa
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
certs/Makefile
View file

@ -1,4 +1,4 @@
.DEFAULT: localhost.cert .DEFAULT: localhost.crt
keysize=2048 keysize=2048
# How to: # How to:
@ -8,7 +8,7 @@ keysize=2048
# Then `make yourhost.key` to create your private key, you can # Then `make yourhost.key` to create your private key, you can
# include keysize=number to change the size of the key. # include keysize=number to change the size of the key.
# Then you can either `make yourhost.csr` to generate a certificate # 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. # to generate a self signed certificate.
.PRECIOUS: %.cnf %.key .PRECIOUS: %.cnf %.key
@ -18,7 +18,7 @@ keysize=2048
openssl req -new -key $(lastword $^) -out $@ -utf8 -config $(firstword $^) openssl req -new -key $(lastword $^) -out $@ -utf8 -config $(firstword $^)
# Self signed # Self signed
%.cert: %.cnf %.key %.crt: %.cnf %.key
openssl req -new -x509 -nodes -key $(lastword $^) -days 365 \ openssl req -new -x509 -nodes -key $(lastword $^) -days 365 \
-sha1 -out $@ -utf8 -config $(firstword $^) -sha1 -out $@ -utf8 -config $(firstword $^)

0
certs/localhost.cert → certs/localhost.crt
View file

2
prosody.cfg.lua.dist
View file

@ -89,7 +89,7 @@ allow_registration = false;
-- to use SSL/TLS, you may comment or remove this -- to use SSL/TLS, you may comment or remove this
ssl = { ssl = {
key = "certs/localhost.key"; key = "certs/localhost.key";
certificate = "certs/localhost.cert"; certificate = "certs/localhost.crt";
} }
-- Only allow encrypted streams? Encryption is already used when -- Only allow encrypted streams? Encryption is already used when

2
prosodyctl
View file

@ -723,7 +723,7 @@ end
function cert_commands.generate(arg) function cert_commands.generate(arg)
if #arg >= 1 and arg[1] ~= "--help" then 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 if ask_overwrite(cert_filename) then
return nil, cert_filename; return nil, cert_filename;
end end