Verified Commit 0ad77095 authored by anarcat's avatar anarcat
Browse files

tpa-rfc-73: make one heading per year in the timeline 

I find it easier to read that way, and then it can be used to link
directly to individual years.
parent dd4beae4

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

+19 −7
Original line number Diff line number Diff line
@@ -1050,7 +1050,8 @@ flowchart TD 


# Timeline



- **2024:**

## 2024



  - [Documentation](#documentation) (merge)

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

  - [Colocations](#colocations) (keep)
@@ -1058,7 +1059,9 @@ flowchart TD 
  - [Password store](#password-store) (merge)

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

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

- **2025:**



## 2025



  - Puppet repos and server:

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

    - Upgrade and converge Puppet modules
@@ -1070,7 +1073,9 @@ flowchart TD 
  - [LimeSuvey](#limesurvey) (merge)

  - [Monitoring](#monitoring) (migrate)

  - [Website](#website) (merge)

- **2026:**



## 2026



  - Basic system functionality:

    - [Authentication](#authentication) (merge)

    - [Backups](#backups) (migrate)
@@ -1080,7 +1085,9 @@ flowchart TD 
    - [Web servers](#web-servers) (merge)

  - [Mailman](#mailman) (merge)

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

- **2027:**



## 2027



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

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

  - [BitTorrent](#bittorrent) (keep)
@@ -1093,17 +1100,22 @@ flowchart TD 
  - [Whisperback](#whisperback) (keep)

  - [GitLab](#gitlab) (merge)

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

- **2028:**



## 2028



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

  - [Weblate](#weblate)

- **2029:**



## 2029



  - [Jenkins](#jenkins)

  - [VPN](#vpn)

  - [Virtualization](#virtualization)



# Alternatives considered



- **Converge both codebases before merging repositories and Puppet Servers:**

## Converge both codebases before merging repositories and Puppet Servers



  This approach would have the following disadvantages:

  - keeping two different Puppet codebase repositories in sync is more prone to

    errors and regressions,