summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2016-07-10 01:16:00 +0200
committerGuilhem Moulin <guilhem@fripost.org>2016-07-10 01:16:00 +0200
commit02772c92ce74490ce60792b0543d60ce71f28e42 (patch)
treee0c2ee2b76d00863f217cc3ea2c52846ec515b91
parentb441dd4a7c3ce72008968d324a12e5c342d164a3 (diff)
Change the pubkey extension from .pem to .pub.
-rwxr-xr-xcerts/gencerts.sh2
-rw-r--r--certs/public/fripost.org.pub (renamed from certs/public/fripost.org.pem)0
-rw-r--r--certs/public/git.fripost.org.pub (renamed from certs/public/git.fripost.org.pem)0
-rw-r--r--certs/public/imap.fripost.org.pub (renamed from certs/public/imap.fripost.org.pem)0
-rw-r--r--certs/public/lists.fripost.org.pub (renamed from certs/public/lists.fripost.org.pem)0
-rw-r--r--certs/public/mail.fripost.org.pub (renamed from certs/public/mail.fripost.org.pem)0
-rw-r--r--certs/public/mx1.fripost.org.pub (renamed from certs/public/mx1.fripost.org.pem)0
-rw-r--r--certs/public/mx2.fripost.org.pub (renamed from certs/public/mx2.fripost.org.pem)0
-rw-r--r--certs/public/smtp.fripost.org.pub (renamed from certs/public/smtp.fripost.org.pem)0
-rw-r--r--roles/IMAP/tasks/imap.yml2
-rw-r--r--roles/MSA/tasks/main.yml2
-rw-r--r--roles/MX/tasks/main.yml2
-rw-r--r--roles/git/tasks/cgit.yml2
-rw-r--r--roles/lists/tasks/nginx.yml2
-rw-r--r--roles/webmail/tasks/roundcube.yml2
-rw-r--r--roles/wiki/tasks/main.yml2
16 files changed, 8 insertions, 8 deletions
diff --git a/certs/gencerts.sh b/certs/gencerts.sh
index 099d846..9318e42 100755
--- a/certs/gencerts.sh
+++ b/certs/gencerts.sh
@@ -20,7 +20,7 @@ usage() {
x509fpr() {
local msg="$1" host cert h spki
host="${msg%%,*}"; host="${host%% *}"; host="${host#\`}"
- cert="$DIR/${host%%:*}.pem"
+ cert="$DIR/${host%%:*}.pub"
spki=$(openssl pkey -pubin -outform DER <"$cert" | openssl dgst -sha256 | sed -nr 's/^[^=]+=\s*//p')
[ "$typ" = mdwn ] && printf '\n [%s](https://crt.sh/?spkisha256=%s&iCAID=16418)\n\n' "$msg" "$spki" \
|| printf ' %s\n X.509: https://crt.sh/?spkisha256=%s&iCAID=16418\n SPKI:\n' \
diff --git a/certs/public/fripost.org.pem b/certs/public/fripost.org.pub
index 48298e0..48298e0 100644
--- a/certs/public/fripost.org.pem
+++ b/certs/public/fripost.org.pub
diff --git a/certs/public/git.fripost.org.pem b/certs/public/git.fripost.org.pub
index 289261a..289261a 100644
--- a/certs/public/git.fripost.org.pem
+++ b/certs/public/git.fripost.org.pub
diff --git a/certs/public/imap.fripost.org.pem b/certs/public/imap.fripost.org.pub
index 8481196..8481196 100644
--- a/certs/public/imap.fripost.org.pem
+++ b/certs/public/imap.fripost.org.pub
diff --git a/certs/public/lists.fripost.org.pem b/certs/public/lists.fripost.org.pub
index 0e520ad..0e520ad 100644
--- a/certs/public/lists.fripost.org.pem
+++ b/certs/public/lists.fripost.org.pub
diff --git a/certs/public/mail.fripost.org.pem b/certs/public/mail.fripost.org.pub
index c6852f6..c6852f6 100644
--- a/certs/public/mail.fripost.org.pem
+++ b/certs/public/mail.fripost.org.pub
diff --git a/certs/public/mx1.fripost.org.pem b/certs/public/mx1.fripost.org.pub
index d2b978c..d2b978c 100644
--- a/certs/public/mx1.fripost.org.pem
+++ b/certs/public/mx1.fripost.org.pub
diff --git a/certs/public/mx2.fripost.org.pem b/certs/public/mx2.fripost.org.pub
index 3bdb105..3bdb105 100644
--- a/certs/public/mx2.fripost.org.pem
+++ b/certs/public/mx2.fripost.org.pub
diff --git a/certs/public/smtp.fripost.org.pem b/certs/public/smtp.fripost.org.pub
index fa89958..fa89958 100644
--- a/certs/public/smtp.fripost.org.pem
+++ b/certs/public/smtp.fripost.org.pub
diff --git a/roles/IMAP/tasks/imap.yml b/roles/IMAP/tasks/imap.yml
index 26bed8d..51e7694 100644
--- a/roles/IMAP/tasks/imap.yml
+++ b/roles/IMAP/tasks/imap.yml
@@ -82,7 +82,7 @@
become: False
fetch_cmd: cmd="openssl x509 -noout -pubkey"
stdin=/etc/dovecot/ssl/imap.fripost.org.pem
- dest=certs/public/imap.fripost.org.pem
+ dest=certs/public/imap.fripost.org.pub
tags:
- genkey
diff --git a/roles/MSA/tasks/main.yml b/roles/MSA/tasks/main.yml
index 7ae2680..3800fe6 100644
--- a/roles/MSA/tasks/main.yml
+++ b/roles/MSA/tasks/main.yml
@@ -30,7 +30,7 @@
# `/usr/sbin/postmulti -i msa -x /usr/sbin/postconf -xh smtpd_tls_cert_file`
fetch_cmd: cmd="openssl x509 -noout -pubkey"
stdin=/etc/postfix/ssl/smtp.fripost.org.pem
- dest=certs/public/smtp.fripost.org.pem
+ dest=certs/public/smtp.fripost.org.pub
tags:
- genkey
diff --git a/roles/MX/tasks/main.yml b/roles/MX/tasks/main.yml
index f95945c..c8853be 100644
--- a/roles/MX/tasks/main.yml
+++ b/roles/MX/tasks/main.yml
@@ -84,7 +84,7 @@
# `/usr/sbin/postmulti -i mx -x /usr/sbin/postconf -xh smtpd_tls_cert_file`
fetch_cmd: cmd="openssl x509 -noout -pubkey"
stdin=/etc/postfix/ssl/mx.fripost.org.pem
- dest=certs/public/mx{{ mxno | default('') }}.fripost.org.pem
+ dest=certs/public/mx{{ mxno | default('') }}.fripost.org.pub
tags:
- genkey
diff --git a/roles/git/tasks/cgit.yml b/roles/git/tasks/cgit.yml
index 48f4d18..5f4e0e9 100644
--- a/roles/git/tasks/cgit.yml
+++ b/roles/git/tasks/cgit.yml
@@ -107,6 +107,6 @@
become: False
fetch_cmd: cmd="openssl x509 -noout -pubkey"
stdin=/etc/nginx/ssl/git.fripost.org.pem
- dest=certs/public/git.fripost.org.pem
+ dest=certs/public/git.fripost.org.pub
tags:
- genkey
diff --git a/roles/lists/tasks/nginx.yml b/roles/lists/tasks/nginx.yml
index fa52781..20b3262 100644
--- a/roles/lists/tasks/nginx.yml
+++ b/roles/lists/tasks/nginx.yml
@@ -30,6 +30,6 @@
become: False
fetch_cmd: cmd="openssl x509 -noout -pubkey"
stdin=/etc/nginx/ssl/lists.fripost.org.pem
- dest=certs/public/lists.fripost.org.pem
+ dest=certs/public/lists.fripost.org.pub
tags:
- genkey
diff --git a/roles/webmail/tasks/roundcube.yml b/roles/webmail/tasks/roundcube.yml
index d1fb8a2..caa91dc 100644
--- a/roles/webmail/tasks/roundcube.yml
+++ b/roles/webmail/tasks/roundcube.yml
@@ -142,6 +142,6 @@
become: False
fetch_cmd: cmd="openssl x509 -noout -pubkey"
stdin=/etc/nginx/ssl/mail.fripost.org.pem
- dest=certs/public/mail.fripost.org.pem
+ dest=certs/public/mail.fripost.org.pub
tags:
- genkey
diff --git a/roles/wiki/tasks/main.yml b/roles/wiki/tasks/main.yml
index c07d4f7..4a64c2f 100644
--- a/roles/wiki/tasks/main.yml
+++ b/roles/wiki/tasks/main.yml
@@ -104,7 +104,7 @@
become: False
fetch_cmd: cmd="openssl x509 -noout -pubkey"
stdin=/etc/nginx/ssl/www.fripost.org.pem
- dest=certs/public/fripost.org.pem
+ dest=certs/public/fripost.org.pub
tags:
- genkey