Infrastructure.md

@@ -8,69 +8,62 @@ This page tries to list the current 'infrastructure' available to the project al
 * Members:
   * See https://github.com/k9mail?tab=members
 
-## Google Groups
-
-### K-9 Mail
-* Link: https://groups.google.com/forum/#!forum/k-9-mail
-* Email: k-9-mail@googlegroups.com
-* Owners:
-  * Jesse
-* Managers:
-  * Leigh [inactive]
-
-### K-9 Mail Developers List
-* Link: https://groups.google.com/forum/#!forum/k-9-dev
-* Email: k-9-dev@googlegroups.com
-* Owners:
-  * Jesse
-
-### K-9 Mail Alpha Testers
-* Link: https://groups.google.com/forum/#!forum/k-9-alpha-testers
-* Email: k-9-alpha-testers@googlegroups.com
-* Owners:
-  * cketti
-
-## Cloudbees (Jenkins)
-* Link: https://k9mail.ci.cloudbees.com/
-* Administrators:
-  * Ashley
-  * cketti
-  * Jesse
-
-## Google+ Page
-* Link: https://plus.google.com/u/0/114221735215588688400
-* Link: http://gplus.to/k9mail
-* Managers:
-  * cketti
-  * Jesse
-  * (Ashley)
-  * (Andrew)
-
 ## Play Store
 * Link: https://play.google.com/apps/publish
 * Link (app): https://play.google.com/store/apps/details?id=com.fsck.k9
 * Managers:
   * Jesse
   * cketti
 
-## k9mail.org
-* Link: http://k9mail.org
-* Owner: Jesse
+## Domain
+* Link: https://k9mail.app
+* Owner: cketti
+
+## Discussion forum
+* Link: https://forum.k9mail.app
+* Admin: cketti
+* Moderators:
+  * cketti
+  * ByteHamster
+
+## Matrix
+* Link: https://matrix.to/#/#k9mail:matrix.org
+* Room: #k9mail:matrix.org
+* Admin: cketti
 
 ## IRC
 
-### Channel
-* Link: irc://irc.freenode.org:6667/k-9
-* Network: Freenode (http://freenode.org/)
-* Channel: #k-9
+* Link: ircs://irc.libera.chat:6697/k9mail
+* Network: Libera Chat (https://libera.chat/)
+* Channel: #k9mail
 * Owner:
-  * Jesse
+  * cketti
 * Operators:
-  * Jesse
   * cketti
-  * ...
 
 ## Transifex
 * Link: https://www.transifex.com/projects/p/k9mail/
 * Maintainers:
-  * cketti
+  * cketti
+
+## Google Groups
+
+### K-9 Mail Developers List
+* Link: https://groups.google.com/forum/#!forum/k-9-dev
+* Email: k-9-dev@googlegroups.com
+* Owners:
+  * Jesse
+
+### K-9 Mail (retired)
+* Link: https://groups.google.com/forum/#!forum/k-9-mail
+* Email: k-9-mail@googlegroups.com
+* Owners:
+  * Jesse
+* Managers:
+  * Leigh [inactive]
+
+### K-9 Mail Alpha Testers (retired)
+* Link: https://groups.google.com/forum/#!forum/k-9-alpha-testers
+* Email: k-9-alpha-testers@googlegroups.com
+* Owners:
+  * cketti