gencerts.sh: improve formatting.

2 files changed, 28 insertions, 33 deletions

diff --git a/website/certs.asc b/website/certs.asc
index 06dfda3..9b51c23 100644
--- a/website/certs.asc
+++ b/website/certs.asc
@@ -29,20 +29,20 @@ Git repository from which this fingerprint list was generated, at commit ID
       SHA1   79:EE:C2:1B:9B:5A:67:D8:1F:DF:D2:F5:2A:A3:68:EB:02:FF:5A:F2
       SHA256 60:DB:17:31:FC:F1:F8:60:DE:7E:84:C1:A2:C4:8C:B9:CD:ED:00:47:50:B2:1F:BF:67:61:6B:13:E8:AD:7D:E5
 
- * SMTP servers (STARTTLS)
-    smtp.fripost.org:587 (Mail Submission Agent)
+ * SMTP servers
+    smtp.fripost.org:587 (Mail Submission Agent, STARTTLS)
     X.509: https://crt.sh/?spkisha1=a7db174b55947b8fbb905fbc48cc99fd2973c7d8&iCAID=16418
     SPKI:
       SHA1   A7:DB:17:4B:55:94:7B:8F:BB:90:5F:BC:48:CC:99:FD:29:73:C7:D8
       SHA256 A2:72:6E:C6:51:4D:66:70:AA:F4:90:08:C1:7A:3F:28:F9:2E:E9:81:E5:30:D1:0E:19:D6:84:7C:EA:A3:C9:05
 
-    mx1.fripost.org:25 (1st Mail eXchange)
+    mx1.fripost.org:25 (1st Mail eXchange, STARTTLS)
     X.509: https://crt.sh/?spkisha1=dfd733fb96ec39584e310535e0dfea592790d40d&iCAID=16418
     SPKI:
       SHA1   DF:D7:33:FB:96:EC:39:58:4E:31:05:35:E0:DF:EA:59:27:90:D4:0D
       SHA256 63:C2:A1:DC:E0:BC:20:A6:CD:E1:6E:AE:1C:EC:71:CF:42:27:0D:1E:46:0F:03:9D:C2:FD:EA:1E:27:48:70:BA
 
-    mx2.fripost.org:25 (2nd Mail eXchange)
+    mx2.fripost.org:25 (2nd Mail eXchange, STARTTLS)
     X.509: https://crt.sh/?spkisha1=a085b9519ff1713cf661c16a7edcf4918a643211&iCAID=16418
     SPKI:
       SHA1   A0:85:B9:51:9F:F1:71:3C:F6:61:C1:6A:7E:DC:F4:91:8A:64:32:11
@@ -74,24 +74,22 @@ Git repository from which this fingerprint list was generated, at commit ID
       SHA256 1C:EA:22:5E:00:BB:B6:89:73:67:7D:5B:EB:95:33:6C:02:A1:A4:20:80:EC:8D:22:35:D3:BB:34:4B:8B:D2:55
 
  * SSH server
-    gitolite@git.fripost.org:22
-    RSA    MD5:0b:e5:47:44:71:cb:41:7d:1e:1b:25:bc:28:e8:c3:a2
-    RSA SHA256:zNZXfa/okPm/tV9dl3gNlizfXAghrMSgrcwICiWx+80
+ gitolite@git.fripost.org:22
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJW+E2vAAoJENOaSZw8IaVSfBYP/AgMFTH5/xM7qQt7DsVgWyDQ
-bAY09WjK2m85XLm/MXbWuK89/ao1AFGvpO8/X6cHeQzvDhvrZJ+L1elm+qpXnGLT
-Iy+JrPc0KMQA9Q3S5iEUApG4NeZkbzKVWHbdUzwhVws2Rx9zRqrn/ddLnDYinhqJ
-bQA+1SCS9Oi5nF1JNCPtJnk6vXABwseAzRwFjOOJPjM+0B6WGkImWAwCdw8jrgkR
-1bFkaNLiVMmDGdHf2dMY/Q8g1hQlZgjDv1DIn9n67dIISVKnHONPZGWij7UDfcFq
-FWGc2Ieh1YjxGTt0bbyr9DzyiUmfTyY9y5HG1qzUAh3YwbJQo8Pt98nx7Xnt8Bcz
-Ms+P/gmy/WIditcwxZWgt9M+KrFOISJGlof9JKXPEx3BEzO9d+ffnud7vvX+vDpk
-nfnx4ECVMWTtrB0s+xB6/KsNvUIjOpJdaLYHDXHpCDIVuD3+qDTKe9iifEvM5Rk+
-Hq7XGkTJWNGR7DUEjC6oMkrpPSSZsBHx3r0yk+EltDV1PuJ2efUpesrpkgDVCyxC
-xsY/c3tvJTK5EBAtI+qS5H8bo4FyYYuH7973wqF0FEwgFItxNEw6F9mF/rDBk9sR
-GEFCrgG6be9yM4fsIrh/p5lwAfJ2lZjUscLnpjN0mv81cihNIIvboMrnjXy6V7Vn
-3P5RVpYKEVlw1aiY1sFs
-=hzY7
+iQIcBAEBCgAGBQJW+FOQAAoJENOaSZw8IaVSYswQAL4YB1pxrbMfLyPNIXluGNKX
+mI3uGMM/wk99lyKo/KCdCBNA/z3VfL8VOpltyd8JE6BhI5g95v4qnDXhhlzvkfsL
+DwAj4qojCklwJPv+JJfCDT7EQSy0Vvi0E7vSmTTCkHmFH3rjl4E8VOz+fHKALTmG
+oJ+ZzNLUwOGMhT6aIkw9IBOxl41/zfjnyXfe4dII1xK2KTMUrUlbN0n5ctR29D6O
+OAeLiat8sVxoOscn1dWuAduTThuOZ/uZ73KFDCGSe4JsQjLFM6PJ9gknS8MfO8cX
+c7qShA34ICrDAuPpxIaX27d8Bng2FxG2jSESf2CJnxuxQ9RS5nVUS3De8IMVKZ40
+bH1+gFJ6rRZ8DgpVC9s8dvbyVdCbnKWnArXb0jYMDmM0eaZqbnor5nj/xGogxG77
+gsBvHXP74H4HnfJvirVwI8QjDsmhF8FFcHQj7G4E7/LzLnZGodmq6G2anIQ23Tzu
+fDHC8xFbt6/HZeZh6uddR4GxAVUBeAKOylJocjE8oZMF8CVDIeB0seUHREgsokEc
+q3f0ghHvvKj1Xztf2m9X9H+5Vs2KpdRrn3hax8fVY82by2mO0/7ycQZYyJC2WgNA
+4r7fM16BOc+lFe0I38E2zYZaRk6772atfcwpkE/88CM1ncSCeWIAJbXjcQEjmprI
+RxQFgCSOwhtk4nbycrMk
+=wRpV
 -----END PGP SIGNATURE-----
diff --git a/website/certs.mdwn b/website/certs.mdwn
index bb6b654..f5971f9 100644
--- a/website/certs.mdwn
+++ b/website/certs.mdwn
@@ -21,58 +21,55 @@ from which this fingerprint list was [[generated|https://git.fripost.org/fripost
 
  * IMAP server
 
-    [[imap.fripost.org:993 (IMAP over SSL), sieve.fripost.org:4190 (ManageSieve, STARTTLS)|https://crt.sh/?spkisha1=79eec21b9b5a67d81fdfd2f52aa368eb02ff5af2&iCAID=16418]]
+    [[`imap.fripost.org:993` (IMAP over SSL), `sieve.fripost.org:4190` (ManageSieve, `STARTTLS`)|https://crt.sh/?spkisha1=79eec21b9b5a67d81fdfd2f52aa368eb02ff5af2&iCAID=16418]]
 
         SHA1   79:EE:C2:1B:9B:5A:67:D8:1F:DF:D2:F5:2A:A3:68:EB:02:FF:5A:F2
         SHA256 60:DB:17:31:FC:F1:F8:60:DE:7E:84:C1:A2:C4:8C:B9:CD:ED:00:47:50:B2:1F:BF:67:61:6B:13:E8:AD:7D:E5
 
- * SMTP servers (STARTTLS)
+ * SMTP servers
 
-    [[smtp.fripost.org:587 (Mail Submission Agent)|https://crt.sh/?spkisha1=a7db174b55947b8fbb905fbc48cc99fd2973c7d8&iCAID=16418]]
+    [[`smtp.fripost.org:587` (Mail Submission Agent, `STARTTLS`)|https://crt.sh/?spkisha1=a7db174b55947b8fbb905fbc48cc99fd2973c7d8&iCAID=16418]]
 
         SHA1   A7:DB:17:4B:55:94:7B:8F:BB:90:5F:BC:48:CC:99:FD:29:73:C7:D8
         SHA256 A2:72:6E:C6:51:4D:66:70:AA:F4:90:08:C1:7A:3F:28:F9:2E:E9:81:E5:30:D1:0E:19:D6:84:7C:EA:A3:C9:05
 
 
-    [[mx1.fripost.org:25 (1st Mail eXchange)|https://crt.sh/?spkisha1=dfd733fb96ec39584e310535e0dfea592790d40d&iCAID=16418]]
+    [[`mx1.fripost.org:25` (1st Mail eXchange, `STARTTLS`)|https://crt.sh/?spkisha1=dfd733fb96ec39584e310535e0dfea592790d40d&iCAID=16418]]
 
         SHA1   DF:D7:33:FB:96:EC:39:58:4E:31:05:35:E0:DF:EA:59:27:90:D4:0D
         SHA256 63:C2:A1:DC:E0:BC:20:A6:CD:E1:6E:AE:1C:EC:71:CF:42:27:0D:1E:46:0F:03:9D:C2:FD:EA:1E:27:48:70:BA
 
 
-    [[mx2.fripost.org:25 (2nd Mail eXchange)|https://crt.sh/?spkisha1=a085b9519ff1713cf661c16a7edcf4918a643211&iCAID=16418]]
+    [[`mx2.fripost.org:25` (2nd Mail eXchange, `STARTTLS`)|https://crt.sh/?spkisha1=a085b9519ff1713cf661c16a7edcf4918a643211&iCAID=16418]]
 
         SHA1   A0:85:B9:51:9F:F1:71:3C:F6:61:C1:6A:7E:DC:F4:91:8A:64:32:11
         SHA256 93:07:B7:87:81:24:E4:E7:9F:98:71:EE:88:CB:9D:4A:82:EA:9E:7C:27:06:5A:21:A8:1D:90:25:67:A8:D2:7A
 
  * Web servers
 
-    [[fripost.org:443 (website), wiki.fripost.org:443 (wiki)|https://crt.sh/?spkisha1=b8cbe1307eba03c3dbbebf65fd8068f8d3e01c7d&iCAID=16418]]
+    [[`fripost.org:443` (website), `wiki.fripost.org:443` (wiki)|https://crt.sh/?spkisha1=b8cbe1307eba03c3dbbebf65fd8068f8d3e01c7d&iCAID=16418]]
 
         SHA1   B8:CB:E1:30:7E:BA:03:C3:DB:BE:BF:65:FD:80:68:F8:D3:E0:1C:7D
         SHA256 7D:0F:A0:6A:EE:F6:8B:03:9F:EA:B9:97:BD:8E:FF:41:E9:81:FA:46:21:8B:13:C2:63:F0:3F:10:8A:F7:6A:DB
 
 
-    [[mail.fripost.org:443 (webmail)|https://crt.sh/?spkisha1=4fe74240983551cf9365eff2d17c3c4660642c30&iCAID=16418]]
+    [[`mail.fripost.org:443` (webmail)|https://crt.sh/?spkisha1=4fe74240983551cf9365eff2d17c3c4660642c30&iCAID=16418]]
 
         SHA1   4F:E7:42:40:98:35:51:CF:93:65:EF:F2:D1:7C:3C:46:60:64:2C:30
         SHA256 48:77:E7:88:C1:1A:A7:17:98:A3:96:13:FF:68:CF:FA:7F:96:B2:D3:5A:62:08:43:32:16:54:69:D2:E5:3C:39
 
 
-    [[lists.fripost.org:443 (list manager)|https://crt.sh/?spkisha1=e94589199544b1c761c1754ba13f8c38d410a533&iCAID=16418]]
+    [[`lists.fripost.org:443` (list manager)|https://crt.sh/?spkisha1=e94589199544b1c761c1754ba13f8c38d410a533&iCAID=16418]]
 
         SHA1   E9:45:89:19:95:44:B1:C7:61:C1:75:4B:A1:3F:8C:38:D4:10:A5:33
         SHA256 38:BC:75:84:E1:2A:9C:27:52:FF:B6:60:CD:3C:C0:97:C2:20:FC:2C:29:CF:93:18:F4:9F:45:8A:C8:60:EB:FD
 
 
-    [[git.fripost.org:443 (git server and its web interface)|https://crt.sh/?spkisha1=02d77cf016f4550dc36ba1c4b6951b652664c828&iCAID=16418]]
+    [[`git.fripost.org:443` (git server and its web interface)|https://crt.sh/?spkisha1=02d77cf016f4550dc36ba1c4b6951b652664c828&iCAID=16418]]
 
         SHA1   02:D7:7C:F0:16:F4:55:0D:C3:6B:A1:C4:B6:95:1B:65:26:64:C8:28
         SHA256 1C:EA:22:5E:00:BB:B6:89:73:67:7D:5B:EB:95:33:6C:02:A1:A4:20:80:EC:8D:22:35:D3:BB:34:4B:8B:D2:55
 
  * SSH server
 
-    gitolite@git.fripost.org:22
-
-        RSA    MD5:0b:e5:47:44:71:cb:41:7d:1e:1b:25:bc:28:e8:c3:a2
-        RSA SHA256:zNZXfa/okPm/tV9dl3gNlizfXAghrMSgrcwICiWx+80
+    `gitolite@git.fripost.org:22`