cleanup branches in tor-puppet.git

in #40861 (closed), @lavamind found over a dozen branches in the repository.

we should figure out what to do with all of those.

I find the following branches here:

> git branch -vv -r | grep -v -e origin/HEAD -e origin/master
  origin/ssh-refactor                    654e787e3 move ferm firewall rules out of authorized_keys logic
  origin/ferm-rules                      fc62e3d44 ferm: add class parameters for rule definitions
  origin/feature-create-tor-weather      9b73d9311 Revert "Create tor-weather user and group for weather-01"
  origin/create-tor-weather              63aa70f6b Enable weather onion service
  origin/torgz-role-account              8a0278baf Remove redundant static_source include
  origin/metricsdb                       3f8734148 lint
  origin/prom-systemd-modules-upgrades   302c6057a upgrade prometheus and systemd modules
  origin/role-variable                   e91fca621 fix variable name, $name is reserved
  origin/retire-nagios-checks            ee7e93c51 purge tor-nagios-checks everywhere but servers that need it (tpo/tpa/team#41671)
  origin/disable_firewall_reject_logging f8da79c8f firewall: push threshold lower to log less
  origin/ssl-notify                      7f6910f2b WIP: try to enforce service notifications for ssl::service
  origin/scrape_job_fqdn_targets         052960b2b scrape lists.torproject.org instead of lists-01
  origin/userkeys-cleanup                05a21ce3d stop using .more keys entirely
  origin/41833-onionoo_backend-systemd   40f70c7e4 Replace @reboot cronjob with systemd unit to start onionoo (tpo/tpa/team#41833)

some of those are indeed pretty old!

> git branch -vv --sort=committerdate --format="%(committerdate:iso8601) %(authoremail) %(refname:short)" -r | grep -v -e origin'
$' -e origin/master
2019-10-30 14:35:20 -0400 <anarcat@debian.org> origin/ssh-refactor
2022-03-01 09:40:28 -0500 <jerome@riseup.net> origin/ferm-rules
2022-11-09 09:46:17 -0800 <kez@torproject.org> origin/feature-create-tor-weather
2022-11-15 11:18:04 -0800 <kez@torproject.org> origin/create-tor-weather
2023-01-10 12:58:36 -0800 <kez@torproject.org> origin/torgz-role-account
2024-02-14 15:09:11 -0500 <jerome@riseup.net> origin/metricsdb
2024-03-04 13:12:09 -0500 <anarcat@debian.org> origin/prom-systemd-modules-upgrades
2024-09-25 11:02:31 -0400 <anarcat@debian.org> origin/role-variable
2024-10-09 16:00:49 -0400 <anarcat@debian.org> origin/retire-nagios-checks
2024-10-31 16:41:50 -0400 <lelutin@torproject.org> origin/disable_firewall_reject_logging
2024-11-04 11:07:49 -0500 <anarcat@debian.org> origin/ssl-notify
2024-11-06 20:04:32 -0500 <anarcat@debian.org> origin/scrape_job_fqdn_targets
2024-11-21 13:03:31 -0500 <anarcat@debian.org> origin/userkeys-cleanup
2024-12-09 16:25:07 -0500 <lelutin@torproject.org> origin/41833-onionoo_backend-systemd

here they are by author:

> git branch -vv --sort=committer --format="%(committerdate:iso8601) %(committeremail) %(refname:short)" -r | grep -v -e origin'$
' -e origin/master
2019-10-30 14:35:20 -0400 <anarcat@debian.org> origin/ssh-refactor
2024-03-04 13:12:09 -0500 <anarcat@debian.org> origin/prom-systemd-modules-upgrades
2024-09-25 11:02:31 -0400 <anarcat@debian.org> origin/role-variable
2024-10-09 16:00:49 -0400 <anarcat@debian.org> origin/retire-nagios-checks
2024-11-04 11:07:49 -0500 <anarcat@debian.org> origin/ssl-notify
2024-11-06 20:04:32 -0500 <anarcat@debian.org> origin/scrape_job_fqdn_targets
2024-11-21 13:03:31 -0500 <anarcat@debian.org> origin/userkeys-cleanup
2024-10-31 16:41:50 -0400 <lelutin@torproject.org> origin/disable_firewall_reject_logging
2024-12-09 16:25:07 -0500 <lelutin@torproject.org> origin/41833-onionoo_backend-systemd
2022-03-01 09:40:28 -0500 <jerome@riseup.net> origin/ferm-rules
2024-02-14 15:09:11 -0500 <jerome@riseup.net> origin/metricsdb
2022-11-09 09:46:17 -0800 <kez@torproject.org> origin/feature-create-tor-weather
2022-11-15 11:18:04 -0800 <kez@torproject.org> origin/create-tor-weather
2023-01-10 12:58:36 -0800 <kez@torproject.org> origin/torgz-role-account

and here's a count by author:

> git branch -vv --sort=committer --format="%(committeremail)" -r | sort | uniq -c                                       (master)
      7 <anarcat@debian.org>
      4 <jerome@riseup.net>
      3 <kez@torproject.org>
      2 <lelutin@torproject.org>

2 of those are false positives for jerome, since they're the master and HEAD refs that i couldn't exclude here.

so. er. oops, my bad?

here's a list of branches to handle:

  • @anarcat prom-systemd-modules-upgrades: waiting on @lavamind to first merge the systemd part, then needs to be rebased, requirement to fix #40077 (closed)
  • @anarcat retire-nagios-checks: actually merged already, even though git branch --merged doesn't detect it, deleted
  • @anarcat origin/role-variable: controversial. the point was to get rid of a linting warning in the base site.pp and remove the role business logic from there (perhaps to one day be able to just have a base class list). i still think it's worth it, @lavamind thoughts?
  • @anarcat origin/ssh-refactor: really old test code (2019), deleted, copied below
  • @anarcat origin/ssl-notify, WIP. attempt at enforcing notify on ssl resources, probably still relevant, #41860
  • @anarcat scrape_job_fqdn_targets: stale, deleted
  • @anarcat origin/userkeys-cleanup: still relevant, see #41890
  • @lelutin origin/disable_firewall_reject_logging: stale (and was already cherry-picked in), deleted
  • @lelutin origin/41833-onionoo_backend-systemd: need to be kept until we can finally move on issue #41833 (closed) - code tracked in https://gitlab.torproject.org/tpo/tpa/puppet-control/-/merge_requests/5
  • @lavamind origin/ferm-rules
  • @lavamind origin/metricsdb
  • @kez origin/feature-create-tor-weather (obsolete)
  • @kez origin/create-tor-weather (obsolete)
  • @kez origin/torgz-role-account (squash-merged in ad33bdc7f (draft of tortgz user for #41007 (closed), 2022-12-20))

a new list:

Edited by lelutin