Commit 68ea9d7a authored by zen's avatar zen
Browse files

TPA-RFC-73: Propose a 5-year timeline 

As discussed during merge planning and during last roadmap meeting,
spread the timeline in 5 years (2025-2029).

refs team#41721
parent fff86cc9

policy/tpa-rfc-73-tails-infra-merge-roadmap.md

+53 −61
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ at this point. 


**References:** ∅



### Sysadmins' Security Policy

### Security Policy



**Summary:** Ongoing adoption by TPA
@@ -622,7 +622,7 @@ the GitLab CI using a patched IkiWiki. 


**Stakeholders:** TPA



**Action:** [Merge][] first, then decide whether to [Migrate][]

**Action:** [Keep][] for now, then decide whether to [Migrate][]



- We want to have experience with both before deciding what to do
@@ -1051,65 +1051,57 @@ flowchart TD 
    class Website merge

```



# Milestones and timeline



- **Q4 2024:**

  - Merge:

    - Password store

      - Colocations

      - Registrars

    - Documentation

    - Mailman lists

    - Security policy

  - Migrate:

    - Calendar

- **Q1 2025:**

  - Merge:

    - EYAML

    - Puppet repos and server

- **Q2 2025:**

  - Authentication

  - Backups

  - DNS

  - Firewall

  - Monitoring

  - TLS

  - Web servers

- **Q3 2025:**

  - Merge:

    - APT repository

    - GitLab

    - LimeSuvey

    - MTA

    - Website

  - Migrate:

    - XMPP / XMPP bot

    - git-annex / Gitolite

  - Retire:

    - Bitcoin

    - Tor bridge

- **Q4 2025:**

    - APT snapshots

    - BitTorrent

    - HedgeDoc

    - ISO history

    - Schleuder

    - Tor browser archive

    - Whisperback

- **Q1-Q2 2026:**

    - Merge:

      - Weblate

    - Migrate:

      - Mirror pool

      - EYAML or Trocla

- **Q3-Q4 2026:**

    - Migrate:

      - Jenkins

    - Retire:

      - VPN

- **Q1 2027:**

  - Migrate:

    - Virtualization

# Timeline



- **2024:**

  - [Documentation](#documentation) (merge)

  - ~~[Calendar](#calendar)~~ (migration already done)

  - [Colocations](#colocations) (keep)

  - [Registrars](#registrars) (keep)

  - [Password store](#password-store) (merge)

  - [Security Policy](#security-policy) (merge)

  - [Tor bridge](#tor-bridge) (retire)

- **2025:**

  - Puppet repos and server:

    - [Upgrade Tor's Puppet Server to Puppet 7](tpo/tpa/team#41819)

    - Upgrade and converge Puppet modules

    - Implement commit signing

    - [EYAML](#eyaml) (keep)

    - [Puppet server](#puppet-server) (merge)

  - [Bitcoin](#bitcoin) (retire)

  - [LimeSuvey](#limesurvey) (merge)

  - [Website](#website) (merge)

- **2026:**

  - Basic system functionality:

    - [Authentication](#authentication) (merge)

    - [Backups](#backups) (migrate)

    - [DNS](#dns) (migrate)

    - [Firewall](#firewall) (migrate)

    - [Monitoring](#monitoring) (migrate)

    - [TLS](#tls) (migrate)

    - [Web servers](#web-servers) (merge)

  - [Mailman](#mailman) (merge)

  - [XMPP](#xmpp) / [XMPP bot](#xmpp-bot) (migrate)

- **2027:**

  - [APT repository](#apt-repository) (keep)

  - [APT snapshots](#apt-snapshots) (keep)

  - [BitTorrent](#bittorrent) (keep)

  - [HedgeDoc](#hedgedoc) (keep)

  - [ISO history](#iso-history) (keep)

  - [MTA](#mta) (merge)

  - [Mirror pool](#mirror-pool) (migrate)

  - [Schleuder](#schleuder) (keep)

  - [Tor browser archive](#tor-browser-archive) (keep)

  - [Whisperback](#whisperback) (keep)

  - [GitLab](#gitlab) (merge)

  - [git-annex](#git-annex) / [Gitolite](#gitolite) (migrate)

- **2028:**

  - Decide between [EYAML](#eyaml) or Trocla or both

  - [Weblate](#weblate)

- **2029:**

  - [Jenkins](#jenkins)

  - [VPN](#vpn)

  - [Virtualization](#virtualization)



# Alternatives considered