From 5a3945c4a4f34e8b57bab8852212e714275b17d4 Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Wed, 13 Jun 2018 14:55:19 -0400
Subject: [PATCH] add news notices and update ssh page

---
 news/016_tildemail.json              | 7 +++++++
 news/017_password_auth_disabled.json | 7 +++++++
 services.php                         | 1 +
 wiki/pages/ssh.md                    | 4 +---
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 news/016_tildemail.json
 create mode 100644 news/017_password_auth_disabled.json

diff --git a/news/016_tildemail.json b/news/016_tildemail.json
new file mode 100644
index 0000000..726fc6e
--- /dev/null
+++ b/news/016_tildemail.json
@@ -0,0 +1,7 @@
+{
+    "published": true,
+    "date": "june 2018",
+    "title": "tildemail",
+    "author": "<a href=\"/~ben/\">~ben</a>",
+    "content": "what started as an initiative to get local mail working ended up with us just setting up a full mailserver with smtp and imap. see the <a href=\"https://tilde.team/wiki/?page=email\">email wiki</a> for more info and <a href=\"https://mail.tilde.team\">webmail</a> for easy access."
+}
diff --git a/news/017_password_auth_disabled.json b/news/017_password_auth_disabled.json
new file mode 100644
index 0000000..c55258e
--- /dev/null
+++ b/news/017_password_auth_disabled.json
@@ -0,0 +1,7 @@
+{
+    "published": true,
+    "date": "june 2018",
+    "title": "password auth disabled",
+    "author": "<a href=\"/~ben/\">~ben</a>",
+    "content": "password auth for ssh is now disabled. you'll need to use an ssh key to log in. please contact me with your pubkey so i can get you back in :)"
+}
diff --git a/services.php b/services.php
index a92e53e..4245e06 100644
--- a/services.php
+++ b/services.php
@@ -6,6 +6,7 @@ $services = [
     'wiki' => ['fa' => 'book', 'url' => '/wiki/'],
     'mastodon' => ['fa' => 'retweet', 'url' => 'https://tilde.zone'],
     'chat' => ['fa' => 'comments-o', 'url' => '/wiki/?page=irc'],
+    'webmail' => ['fa' => 'envelope', 'url' => 'https://mail.tilde.team'],
     'cryptpad' => ['fa' => 'sticky-note', 'url' => 'https://pad.tilde.team'],
 ];
 
diff --git a/wiki/pages/ssh.md b/wiki/pages/ssh.md
index 0bf18e7..36114e1 100644
--- a/wiki/pages/ssh.md
+++ b/wiki/pages/ssh.md
@@ -12,9 +12,7 @@ category:
 
 ---
 
-> tilde.team will be disabling ssh password authentication starting august 1, 2018. 
-
-> all users will be required to create an ssh keypair before then, or will be required to proceed with manual account recovery with [~ben](/~ben/)
+> all users are now required to use an ssh keypair for login, or will be required to proceed with manual account recovery with [~ben](/~ben/)
 
 
 ** if you just want to get right to a tutorial you can [skip over this background info](#tutorial)**