Update certs.

2 files changed, 54 insertions, 46 deletions

diff --git a/website/certs.asc b/website/certs.asc
index 0ea6a48..ca19a8d 100644
--- a/website/certs.asc
+++ b/website/certs.asc
@@ -26,21 +26,21 @@ immediately! -- admin@fripost.org
     SHA256 B1:F4:82:E9:6E:B7:B0:0A:4A:FE:BD:92:6C:8D:EE:F6:6E:8C:1B:33:D3:7A:4B:6E:FB:37:D9:21:62:99:C2:73
 
  * Web servers
-    fripost.org:443 (website), mail.fripost.org:443 (webmail), lists.fripost.org:443 (list manager)
+    fripost.org:443 (website), mail.fripost.org:443 (webmail), wiki.fripost.org:443 (wiki)
     SHA1   E1:82:59:FD:7F:9A:11:EF:DC:1B:46:3B:AB:9F:F6:BB:A0:E4:D4:59
     SHA256 7D:F2:7C:67:90:91:EB:5E:1E:25:D0:7B:A4:A5:72:9F:EA:20:EC:F0:74:1C:25:66:1D:72:56:A3:3B:53:D9:9A
 
-    wiki.fripost.org:443 (wiki)
-    SHA1   96:4E:77:71:F3:2B:C7:60:50:58:37:53:C4:B1:F1:50:95:69:FD:C0
-    SHA256 D0:02:01:81:03:86:F3:53:8A:BA:DE:7D:07:D5:E0:31:D8:5B:5D:35:72:BC:68:8B:E4:BF:86:33:42:43:21:90
+    lists.fripost.org:443 (list manager)
+    SHA1   9B:EA:15:0C:B3:17:EC:CB:E5:38:DA:93:5C:1D:52:98:13:E4:8A:BC
+    SHA256 04:86:AF:AB:68:35:D2:48:0C:F3:55:54:98:5D:2A:48:69:D7:C5:B2:CC:1C:F7:6F:F8:54:25:CF:E5:91:88:21
 
-    git.fripost.org:443 (git server and its web interface)
-    SHA1   EA:50:38:19:38:6A:49:BF:5D:3C:4D:04:64:6F:0D:D3:AC:20:76:C2
-    SHA256 08:D9:18:05:A3:F5:B6:8E:20:81:E1:8A:36:1B:44:AD:4E:36:6D:D1:BA:FC:3D:26:F9:F5:4B:68:A9:0F:F3:21
+    git.fripost.org:443 (git server), gitweb.fripost.org:443 (gitweb interface)
+    SHA1   70:14:8A:A0:29:8E:53:65:8E:23:CF:BA:45:F1:0F:CB:68:81:AC:B6
+    SHA256 84:2A:13:7A:B2:20:25:D6:38:8C:EE:8B:BC:A2:60:C5:AC:CD:8A:6B:67:17:B4:78:7F:97:3F:DE:7B:7D:83:B2
 
-    antilop.fripost.org:443 (list manager)
-    SHA1   6F:1A:3B:0F:2C:5A:BC:33:09:C6:D4:F8:43:2C:07:6E:B0:FD:DB:7B
-    SHA256 FA:AC:E2:4C:C7:DD:D8:A6:24:20:0E:48:FC:91:D2:F0:CC:BD:BD:57:B1:F9:67:84:73:96:F1:90:4C:50:C1:F1
+ * SSH server
+    gitolite@git.fripost.org
+    4096 0b:e5:47:44:71:cb:41:7d:1e:1b:25:bc:28:e8:c3:a2 /etc/ssh/ssh_host_rsa_key.pub (RSA)
 
 
 To get the whole certificate for imap.fripost.org:993, type the following
@@ -68,21 +68,20 @@ Alternatively, using a pipe:
 
     openssl s_client -connect imap.fripost.org:993 </dev/null \
     | openssl x509 -noout -fingerprint -sha256
-
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJU86fvAAoJENOaSZw8IaVSiucP/3DJRf5aHaWIjHEd2GsSbIfp
-hRLWHXN9bnsXW+z1UK17b8GgaPihlCwDyMbQ5ZXLcEN183z/X40a+Lt0mRJVxTjL
-XLJQYc9P6MapTRPOtuq2mF+RGiIhuXI8ehLF34dF5uVhfId/LshGBc+oH26a4Y+2
-YpLMhjrhQiQwfLHkuf+f5F57EOIJYv8sDj7x2pZXLBAQN+OK7siV1/sJa0trcXZD
-k0oEBgzm9VoIsy76joKnqGPS27sBNL1qmTPjI+hVPcXFQ6C1Irfe8HkWXiMqo1zq
-Xks78ONAo9zkNp4kvHgz4eWNGX15mfWK+kXEtalQtllfB4GioZtFNTN2uZZHa322
-Qb+/OobeOrSLNu635uYTmQXKI9RprYur0csK5hbvpvSAFsw8PKxmubBuKHWmhVxw
-BwJCwbH8GcmSs4ON3R+01Wrv1JMtfixs19wW+gEgvYQO5xTHY6pvDvG78WLmhl+0
-qgni/VuAYtbAyztOlyZEZ8q9lvWC1wlj2DqwHW33PmqQTY46nK8x5C5kodpR4fi7
-Hk0OnhA9LzMEzMdhuDvyzLWdhDSXYyiFLnpPxarl477pQttJ3WvY60H9vsHJwGUB
-MUYkHWCBems0Z8McgGU5i+Djw/WE/DZJWOBn9cBawGw+pG3E+1nJsLg0+NVyDIpR
-G0RR6uhLfleLnI60ljiK
-=lMAq
+iQIcBAEBCgAGBQJVa3YUAAoJENOaSZw8IaVSx4UP/RZoe5VxMlniBJc+T8ZLD1Cw
+6UbiuCPzdXkW8MSsk4wqi8pKiuAjo2ms8Mx4DS25Md9l/55tOVP0k1QElF23flfZ
+f0dCTAY/yv5cV0CnNysks09m870Wvr9vSj4CrcMV9m0TmZrwUqCOj8dO22jC6YqV
+iPOEIBT08aPwnrqq0uieI+JlsjgbVjNiYt3AAJq00ZtfdS41WnjFuFxsqNV3wsRn
+PI77pfw7Ga6kVADngLb2Q2seWlr/9Lp2EMdTI+YBx+w2AlwuaN5hLxrdpdwbvWuP
+Vbpz9N4/GZHN1nIjWFELz/hHa/Z9aECsPtNYoCfQEC9DbkOVqg/SYyfM1zVy4+if
+DjFlENDTolHIM82LRPd8oLxMQ4ieMZur/BDBvVmca/9OSH4IgHDi9irjdDdLvEUj
+75+DDhRgKfzpzQ4BVhP4kJ0f8geGcsMwAMarou58iwDVKPrbpH50XNhYwgfiSwCl
+eTj+WxnK44GtNSEKFgrrDxXrw52ZFYDWEyH0e9f1qvA+REUIb2IdCGixuZRxLjmh
+vP/z3EiYEYkMC6UPvyRX1i6WYUKeqipaVPu4DTGz4Lc/Vrjo3gQh2I+Ti3EPrpJU
+qjeZaS85yDyUfrk2Xu/B6Sbn+JKC7R3LuWIKaaZjCUxn73CTF6OzdjS7y8bkjW6w
+Dipo5kEIdweuBUR6iQjE
+=S3yz
 -----END PGP SIGNATURE-----
diff --git a/website/certs.mdwn b/website/certs.mdwn
index f621597..bb15262 100644
--- a/website/certs.mdwn
+++ b/website/certs.mdwn
@@ -5,45 +5,52 @@ X.509 certificates Fripost uses on its publicly available services.  Please
 consider any mismatch as a man-in-the-middle attack, and let us know
 immediately! -- admin@fripost.org
 
-Also refer to the [[signed version of this page|certs.asc]]
-
  * IMAP server
 
     imap.fripost.org:993
-    SHA1   8A:81:CF:C3:04:01:BC:C6:58:03:CB:4B:61:F0:C9:0B:09:51:B8:F8
-    SHA256 52:BA:FF:9F:7A:6B:7B:50:51:CB:64:BE:46:72:65:8E:D6:FC:3C:CE:5B:6C:9F:9F:E0:58:00:7B:8F:13:6E:D3
+
+        SHA1   8A:81:CF:C3:04:01:BC:C6:58:03:CB:4B:61:F0:C9:0B:09:51:B8:F8
+        SHA256 52:BA:FF:9F:7A:6B:7B:50:51:CB:64:BE:46:72:65:8E:D6:FC:3C:CE:5B:6C:9F:9F:E0:58:00:7B:8F:13:6E:D3
 
  * SMTP servers (STARTTLS)
 
     smtp.fripost.org:587 (Mail Submission Agent)
-    SHA1   03:87:02:C9:6E:01:D3:AD:BC:EC:77:CC:A5:C5:37:C1:D8:C1:29:BC
-    SHA256 6C:89:92:3C:A2:53:E0:14:9E:14:11:17:FF:FA:EB:12:3E:BA:0A:B0:C2:BE:70:18:8C:3D:7A:69:EB:00:5E:BB
+
+        SHA1   03:87:02:C9:6E:01:D3:AD:BC:EC:77:CC:A5:C5:37:C1:D8:C1:29:BC
+        SHA256 6C:89:92:3C:A2:53:E0:14:9E:14:11:17:FF:FA:EB:12:3E:BA:0A:B0:C2:BE:70:18:8C:3D:7A:69:EB:00:5E:BB
 
     mx1.fripost.org:25 (1st Mail eXchange)
-    SHA1   A5:9D:30:9A:49:4E:45:02:05:4B:D9:F8:12:8E:EE:F3:A8:CD:5C:4A
-    SHA256 85:C9:C3:07:D6:BB:4E:A2:66:DF:DA:3B:B8:A4:D6:B3:71:B0:48:05:DD:A6:87:83:3F:B5:3E:4F:CF:1E:30:5B
+
+        SHA1   A5:9D:30:9A:49:4E:45:02:05:4B:D9:F8:12:8E:EE:F3:A8:CD:5C:4A
+        SHA256 85:C9:C3:07:D6:BB:4E:A2:66:DF:DA:3B:B8:A4:D6:B3:71:B0:48:05:DD:A6:87:83:3F:B5:3E:4F:CF:1E:30:5B
 
     mx2.fripost.org:25 (2nd Mail eXchange)
-    SHA1   67:67:D2:A6:0A:E5:8F:83:A9:85:26:01:71:80:24:C6:0B:DA:30:4F
-    SHA256 B1:F4:82:E9:6E:B7:B0:0A:4A:FE:BD:92:6C:8D:EE:F6:6E:8C:1B:33:D3:7A:4B:6E:FB:37:D9:21:62:99:C2:73
+
+        SHA1   67:67:D2:A6:0A:E5:8F:83:A9:85:26:01:71:80:24:C6:0B:DA:30:4F
+        SHA256 B1:F4:82:E9:6E:B7:B0:0A:4A:FE:BD:92:6C:8D:EE:F6:6E:8C:1B:33:D3:7A:4B:6E:FB:37:D9:21:62:99:C2:73
 
  * Web servers
 
-    fripost.org:443 (website), mail.fripost.org:443 (webmail), lists.fripost.org:443 (list manager)
-    SHA1   E1:82:59:FD:7F:9A:11:EF:DC:1B:46:3B:AB:9F:F6:BB:A0:E4:D4:59
-    SHA256 7D:F2:7C:67:90:91:EB:5E:1E:25:D0:7B:A4:A5:72:9F:EA:20:EC:F0:74:1C:25:66:1D:72:56:A3:3B:53:D9:9A
+    fripost.org:443 (website), mail.fripost.org:443 (webmail), wiki.fripost.org:443 (wiki)
+
+        SHA1   E1:82:59:FD:7F:9A:11:EF:DC:1B:46:3B:AB:9F:F6:BB:A0:E4:D4:59
+        SHA256 7D:F2:7C:67:90:91:EB:5E:1E:25:D0:7B:A4:A5:72:9F:EA:20:EC:F0:74:1C:25:66:1D:72:56:A3:3B:53:D9:9A
 
-    wiki.fripost.org:443 (wiki)
-    SHA1   96:4E:77:71:F3:2B:C7:60:50:58:37:53:C4:B1:F1:50:95:69:FD:C0
-    SHA256 D0:02:01:81:03:86:F3:53:8A:BA:DE:7D:07:D5:E0:31:D8:5B:5D:35:72:BC:68:8B:E4:BF:86:33:42:43:21:90
+    lists.fripost.org:443 (list manager)
 
-    git.fripost.org:443 (git server and its web interface)
-    SHA1   EA:50:38:19:38:6A:49:BF:5D:3C:4D:04:64:6F:0D:D3:AC:20:76:C2
-    SHA256 08:D9:18:05:A3:F5:B6:8E:20:81:E1:8A:36:1B:44:AD:4E:36:6D:D1:BA:FC:3D:26:F9:F5:4B:68:A9:0F:F3:21
+        SHA1   9B:EA:15:0C:B3:17:EC:CB:E5:38:DA:93:5C:1D:52:98:13:E4:8A:BC
+        SHA256 04:86:AF:AB:68:35:D2:48:0C:F3:55:54:98:5D:2A:48:69:D7:C5:B2:CC:1C:F7:6F:F8:54:25:CF:E5:91:88:21
 
-    antilop.fripost.org:443 (list manager)
-    SHA1   6F:1A:3B:0F:2C:5A:BC:33:09:C6:D4:F8:43:2C:07:6E:B0:FD:DB:7B
-    SHA256 FA:AC:E2:4C:C7:DD:D8:A6:24:20:0E:48:FC:91:D2:F0:CC:BD:BD:57:B1:F9:67:84:73:96:F1:90:4C:50:C1:F1
+    git.fripost.org:443 (git server), gitweb.fripost.org:443 (gitweb interface)
+
+        SHA1   70:14:8A:A0:29:8E:53:65:8E:23:CF:BA:45:F1:0F:CB:68:81:AC:B6
+        SHA256 84:2A:13:7A:B2:20:25:D6:38:8C:EE:8B:BC:A2:60:C5:AC:CD:8A:6B:67:17:B4:78:7F:97:3F:DE:7B:7D:83:B2
+
+ * SSH server
+
+    gitolite@git.fripost.org
+
+        4096 0b:e5:47:44:71:cb:41:7d:1e:1b:25:bc:28:e8:c3:a2 /etc/ssh/ssh_host_rsa_key.pub (RSA)
 
 
 To get the whole certificate for imap.fripost.org:993, type the following
@@ -71,3 +78,5 @@ Alternatively, using a pipe:
 
     openssl s_client -connect imap.fripost.org:993 </dev/null \
     | openssl x509 -noout -fingerprint -sha256
+
+Also refer to the [[signed version of this page|certs.asc]]