summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2016-07-12 15:46:03 +0200
committerGuilhem Moulin <guilhem@fripost.org>2016-07-12 15:46:03 +0200
commit00f942860717cf492c6bd8c8fc32652991683b20 (patch)
treebbc182723bf3b7aee0041d6dd4023b9a84e06832
parentd2ddf22d53fdc0c6da0566d68092fc433bf28d25 (diff)
gencerts: Include SAN for the website and webmail.
-rwxr-xr-xcerts/gencerts.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/certs/gencerts.sh b/certs/gencerts.sh
index 18dc100..080257f 100755
--- a/certs/gencerts.sh
+++ b/certs/gencerts.sh
@@ -62,43 +62,43 @@ sshfpr() {
while read t h fpr; do
printf '%s %6s:%s\n' "$indent$t" "$h" "$fpr"
done
}
allfpr() {
local typ="$1"
[ "$typ" = mdwn ] && indent=' ' || indent=' '
cat <<- EOF
* IMAP server
$(x509fpr '`imap.fripost.org:993` (IMAP over SSL), `sieve.fripost.org:4190` (ManageSieve, `STARTTLS`)')
* SMTP servers
$(x509fpr '`smtp.fripost.org:587` (Mail Submission Agent, `STARTTLS`)')
$(x509fpr '`mx1.fripost.org:25` (1st Mail eXchange, `STARTTLS`)')
$(x509fpr '`mx2.fripost.org:25` (2nd Mail eXchange, `STARTTLS`)')
* Web servers
- $(x509fpr '`fripost.org:443` (website), `wiki.fripost.org:443` (wiki)')
+ $(x509fpr '`fripost.org:443`, `www.fripost.org:443` (website), `wiki.fripost.org:443` (wiki)')
- $(x509fpr '`mail.fripost.org:443` (webmail)')
+ $(x509fpr '`mail.fripost.org:443`, `webmail.fripost.org:443` (webmail)')
$(x509fpr '`lists.fripost.org:443` (list manager)')
$(x509fpr '`git.fripost.org:443` (git server and its web interface)')
* SSH server
$(sshfpr '`gitolite@git.fripost.org:22`')
EOF
}
[ $# -eq 1 ] || usage
asc="$1"
asc2=$(mktemp --tmpdir)
src=$(mktemp --tmpdir)
src2=$(mktemp --tmpdir)
mdwn="${asc%.asc}.mdwn"
mdwn2=$(mktemp --tmpdir)
DIR="$(dirname "$0")/public"