diff --git a/policy/tpa-rfc-73-tails-infra-merge-roadmap.md b/policy/tpa-rfc-73-tails-infra-merge-roadmap.md index b1d568773c10be2a33d41c94b93119ba219ebede..e0dc46be78b60de027b2dee40843e496d8dabd92 100644 --- a/policy/tpa-rfc-73-tails-infra-merge-roadmap.md +++ b/policy/tpa-rfc-73-tails-infra-merge-roadmap.md @@ -42,7 +42,6 @@ Summary: Tails infra merge roadmap. | Documentation | TPA | low | | | Password Store | TPA | low | | | [Schleuder][] | Tails Team, Community Council | low | | -| Sysadmins documentation | TPA | low | | | [APT repository][] (reprepro) | Tails Team | medium | | | Colocations | TPA | medium | | | [LimeSurvey][] | UX Team | medium | | @@ -50,9 +49,9 @@ Summary: Tails infra merge roadmap. | [MTA][] (postfix) | TPA | medium | | | Registrars | TPA | medium | | | Sysadmins GitLab | TPA, Tails Team | medium | | -| Puppet | TPA | high | | +| Web servers | TPA | medium | | +| Puppet | TPA | high | Everything we'll "keep", Backups, TLS, Monitoring, Firewall, Authentication | | [Sysadmins Security Policy][] | TPA | high | | -| [Weblate][] | Tails Team, Community Team | high | | ### Retire @@ -61,12 +60,15 @@ Summary: Tails infra merge roadmap. | [Bitcoin][] | Finances | low | | | Calendar | TPA, Tails Team | low | | | [Meeting reminder][] | Tails Team | low | | -| [Backups][] | TPA | medium | Puppet | -| TLS (tails::profile::letsencrypt) | TPA | medium | Puppet | +| XMPP Bot | Tails Team | low | | +| Instant messaging (XMPP) | Tails Team | medium | XMPP Bot | +| [Backups][] | TPA | medium | Monitoring | +| TLS (tails::profile::letsencrypt) | TPA | medium | Monitoring | | Virtualization | TPA | medium | | -| Firewall ([puppet-tirewall] | TPA | high | Puppet | -| [DNS][] (PowerDNS) | TPA | high | Puppet | -| Monitoring ([Icinga2][]) | TPA | high | Puppet | +| [DNS][] (PowerDNS) | TPA | high | | +| Firewall ([puppet-tirewall]) | TPA | high | | +| [Jenkins][] | Tails Team | high | VPN | +| Monitoring ([Icinga2][]) | TPA | high | | | VPN ([Tinc][]) | TPA | high | | ### Need discussion @@ -75,14 +77,11 @@ Summary: Tails infra merge roadmap. | ------------------------------------------ | ----------------------------- | ---------- | ------- | | [git-annex][] | Tails Team | low | | | [Tor Bridge][] | Tails Team | low | | -| XMPP Bot | Tails Team | low | | | [Gitolite][] | TPA, Tails Team | medium | | | Tails Team GitLab | Tails Team | medium | | -| Web servers | TPA | medium | | -| Instant messaging (XMPP) | Tails Team | medium | | -| Authentication ([puppet-rbac]) | TPA | high | Puppet | -| [Jenkins][] | Tails Team | high | VPN | +| Authentication ([puppet-rbac]) | TPA | high | | | [Mirror pool][] (Rsync, Mirrorbits) | TPA | high | | +| [Weblate][] | Tails Team, Community Team | high | | | Website (IkiWiki) | Tails Team | high | | [APT repository]: https://tails.net/contribute/APT_repository/custom/