Compare revisions

David Runge · Leonidas Spyropoulos · Leonidas Spyropoulos · Evangelos Foutras · Evangelos Foutras · Evangelos Foutras
--- a/.gitlab/issue_templates/Offboarding.md
+++ b/.gitlab/issue_templates/Offboarding.md
@@ -28,6 +28,7 @@ This template should be used for offboarding Arch Linux team members.
 - [ ] Ask the user to leave `#archlinux-staff` on Libera Chat and forget the password.
 - [ ] Remove staff cloak on Libera Chat ([Group contacts](https://wiki.archlinux.org/title/Arch_IRC_channels#Libera_Chat_group_contacts)).
 - [ ] Remove the user from relevant staff groups on Keycloak.
+- [ ] Move the user from the public list of their usergroup on archweb ([support staff](https://archlinux.org/people/support-staff/) / [TUs](https://archlinux.org/people/trusted-users/) / [devs](https://archlinux.org/people/developers/)) to the respective fellow site ([fellow support staff](https://archlinux.org/people/support-staff-fellows/) / [fellow TUs](https://archlinux.org/people/trusted-user-fellows/) / [fellow devs](https://archlinux.org/people/developer-fellows/))

 ## Main key offboarding checklist


--- a/docs/servers.md
+++ b/docs/servers.md
@@ -163,3 +163,8 @@ The [Arch Linux Archive](https://archive.archlinux.org) is mirrored to three ded
  - https://america.archive.pkgbuild.com
  - https://asia.archive.pkgbuild.com
  - https://europe.archive.pkgbuild.com
+
+## gitlab.archlinux.org
+
+### Services
+- Gitlab
\ No newline at end of file
--- a/docs/ssh-hostkeys.txt
+++ b/docs/ssh-hostkeys.txt
@@ -131,15 +131,13 @@
 3072 MD5:20:2f:93:37:ae:33:e6:3e:9f:74:b6:57:c9:f3:58:9e root@gemini.archlinux.org (RSA)

 # gitlab.archlinux.org
-1024 SHA256:mbHLMb1i7JBTytqWxpu8bWz7suiSNXpuTdla6/l6yK8 root@archlinux-packer (DSA)
-256 SHA256:0OBfrHiu/X7HcECLaOQFY3XElaiH3qxcltK6kjH9PRI root@archlinux-packer (ECDSA)
-256 SHA256:quM6hxvBB2qgz+x3/mdU7hoqBwoOlJrAuiThe3ht0Cc root@archlinux-packer (ED25519)
-3072 SHA256:dEFgLw+tPon4TBEr6c1ofIWI7VZdVM8fuTXseTztrAw root@archlinux-packer (RSA)
-
-1024 MD5:d6:72:6e:bd:39:6b:1d:89:7e:8c:0b:01:99:90:69:f2 root@archlinux-packer (DSA)
-256 MD5:d1:f9:5b:21:41:0e:7e:1d:4c:01:c7:28:2e:45:98:bc root@archlinux-packer (ECDSA)
-256 MD5:3b:a2:48:8c:33:ac:8b:74:43:d4:4f:f1:fc:78:be:20 root@archlinux-packer (ED25519)
-3072 MD5:a3:ce:cf:2c:59:05:5d:eb:a0:1f:fb:30:81:cc:07:d8 root@archlinux-packer (RSA)
+256 SHA256:ZHy7zbNNwKHukTEyFcAT2Ns+mT/wlc2vAjJULnlOroE root@gitlab.archlinux.org (ECDSA)
+256 SHA256:KD3Og7bPg9glmODrqUKN0r3Jl18pQ0OVp2MT7xv/bm8 root@gitlab.archlinux.org (ED25519)
+3072 SHA256:2R7QoVWeZ2DpKEsZBgVKUieM+9TQu6g9N62CIJCyVtc root@gitlab.archlinux.org (RSA)
+
+256 MD5:a7:df:ab:0d:bc:7c:11:c7:26:b8:c2:59:63:06:95:10 root@gitlab.archlinux.org (ECDSA)
+256 MD5:2d:bb:6a:c6:7d:88:16:94:04:8c:67:59:22:d8:c9:c6 root@gitlab.archlinux.org (ED25519)
+3072 MD5:8b:84:e2:0e:a6:be:d6:aa:6c:2f:ec:89:4d:db:21:bf root@gitlab.archlinux.org (RSA)

 # gluebuddy.archlinux.org
 1024 SHA256:eKv7TBDRnYRCA/DtyNOAezBL1p/G2zbqCYsyUIRYAWw root@archlinux-packer (DSA)

--- a/docs/ssh-known_hosts.txt
+++ b/docs/ssh-known_hosts.txt
@@ -71,9 +71,9 @@ gemini.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG3ghrZI2G6zc3RKzouAOdg
 gemini.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDL7txJKe2OeqTWTAmuo+nUaBMvgW6NiEN5f5DB+0ZE7ilkNj8tNRV1hxQfDxndzvMe5VzT0NynLh2Zdwzf9aoqyRUGUXMQeAAjq1dDpv5dNVix6NMmsMiv565C3h5B5em6UrOSl7h8vlfXuZIsBRhWda1Gxvu1sqSoMiizwdTPOBL8KWLgkJPeS5oI16j+ssC6xh3Z6RFIaONrFMiXc5xAEHBMwZM9JDM3mPDiT7gY9IS6GKydbOa7eHw9QQaDVaBzTtaszOvMfby/dnnuF9xIhE8d9bes1MwMTd9HlwqLaWADVFlGJICYgAHe7Gz7BhhkFHMuRz9rQ5jRKztMHXXUeDpocleAe71gHr0oq4K+FlDCRnNUHICvLfRUBe7gBo1kZzzzT+pNIEJD2KH2jEMkbukxfFeQ27P3ZWaD8JIi4EfgR5QUilcGAKqXG/9/mFTR2lBhwZdYIYJicbMprqrxNe3Q/8RhxVajguO3C43mbpy2o7XSlvVSW2OUE21C2Uc=

 # gitlab.archlinux.org
-gitlab.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOm/nkHKfEMkFy1+w5n5QAdeJnW1C/DKXbzxVvO1DrZb99O/9DzzDB44lx6VyEI68NYAH9tqRzRwzsawnQ9o520=
-gitlab.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHlEYgcEupuvacbGF90L0PK8ZwL605p2APY5CFHv+aTV
-gitlab.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxF7B0Ni51J11LQcCKcABLI1TJPAKgLKX391n+TVmyrdT0i6HVseJ3e5nEgjR1dionZgME1l3nBeAvVQLqw1EvztSBpAZewH9feyQhTmNDFjij5Q/xs9r00Wd0m4reHx9BdHPPjKhYM+H09vofmOlZt8yJVfH4ziQeA5+kLLdfwSp+152n9CSsLJw2lACT2eha4bvR+Qze3ufZBF4njRePb5fQTJVRgLcavqNky+WMlUPHpRuElX1Djfghj0OaK9TSkR9ij9jxvC836EDkLX/lPTgVDTP/oQYtlUrR9b6O+QAN/yHZmrFqQ8CADQuDuBF4xH6BxecJbjMfnryIdgXAz3CfoPfRS8zsIO6k9/Mmzx8rTeP18+ysq4yvhSmfsmYdkcNvOFNhYc8/4ViPghQQyR3GZEH3JU8cL1WR68iNomhR03WtttgXEuhWopFdWfYKu1AyPtbweFnLxarlJ2UEj80XL8iEoR60e+MsskaQNYnTJJaitwztaRn6q/Enr0U=
+[gitlab.archlinux.org]:2222 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEBI63C2m0596ZkmtvsR6IDABog4QFxrR2ZWiyR/dpJXS4YnF9+JWKD6N/3h0zLDvfjebAU3vKUpzVmoNwldTRI=
+[gitlab.archlinux.org]:2222 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJycPRIJd8q+ZFOcVwghbQdSfZ8i/TPoRC6JDGmNFdlI
+[gitlab.archlinux.org]:2222 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDnaAweRBwLXxjKJkSOZ6PyfS7I6pyr4Eydgdcc+9D3I1efvvj/uK7uZIGd5U+8apOt383N3hP2fEUhVONVnXeuj9iFzVRoflsYraa4pHyV3Oo+DYBayDr+9oD3xN1u7VzAE7z38oarCKjCvuCEgNLX3o6/gXM3HtKpPoU3B8Uwp6kdxi/8wBjECK0F9CuGKKzDhC34WcoWGWmc6MksnudF5C7zWSFkI3mcqeH4neLZziZ2fJVdf2z8kN7YuSotQIbH+s2QzQ7evviObzHUskyDMGrzloc6xVdCNWthpwZ9ziLJhPEcMYOhp9rbuuDOrNRwSAJsfPb3g1NMf6fiRG5O7HXOH+ZiJyXOC+oQ7mNqJ5/l77DonschXEcrYIjOvzBH0cx3/v+jaPq2RCa5gIHxwHwTWDH1LhDi+6qusC17fh06Yps1ImAW0mRt5FR25FzjIByuEwNmO6kqG5IScChFlpP884+kqdifPhEYEyiYlfx0+PMAoIcGuOSpPgkZOPM=

 # gluebuddy.archlinux.org
 gluebuddy.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIee6Gt+QO0+6MdJK0TQnHOuwkwmmUqHPIoIWZWrwT/0/YaYriU+SO3losnJt385kTCSJfpvWPVdjWB4LABeo04=

--- a/group_vars/all/archusers.yml
+++ b/group_vars/all/archusers.yml
 arch_groups:
  - dev
+  - junior-dev
  - tu
  - fellows
  - multilib
  - support-staff
+  - packager
+  - junior-packager

 arch_users:
  alertmanager:
@@ -14,11 +17,15 @@ arch_users:
    groups: []
  ainola:
    name: "Brett Cornwall"
+    email: "ainola@archlinux.org"
    ssh_key: ainola.pub
    groups:
      - tu
+      - packager
+      - junior-packager
  alad:
    name: "Alad Wenter"
+    email: "alad@archlinux.org"
    ssh_key: alad.pub
    hosts:
      - mail.archlinux.org
@@ -27,88 +34,137 @@ arch_users:
      - support-staff
  alerque:
    name: "Caleb Maclennan"
+    email: "alerque@archlinux.org"
    ssh_key: alerque.pub
    groups:
      - tu
+      - packager
+      - junior-packager
  alex19ep:
    name: "Alexander Epaneshnikov"
+    email: "alex19ep@archlinux.org"
    ssh_key: alex19ep.pub
    groups:
      - tu
      - multilib
+      - packager
+      - junior-packager
  allan:
    name: "Allan McRae"
+    email: "allan@archlinux.org"
    ssh_key: allan.pub
+    hosts:
+      - mail.archlinux.org
    groups:
-      - dev
-      - multilib
-      - tu
+      - support-staff
  alucryd:
    name: "Maxime Gauduin"
+    email: "alucryd@archlinux.org"
    ssh_key: alucryd.pub
    groups:
      - dev
+      - junior-dev
      - tu
      - multilib
+      - packager
+      - junior-packager
  artafinde:
    name: "Leonidas Spyropoulos"
+    email: "artafinde@archlinux.org"
    ssh_key: "artafinde.pub"
    groups:
+      - dev
+      - junior-dev
+      - multilib
      - tu
+      - packager
+      - junior-packager
  anatolik:
    name: "Anatol Pomozov"
+    email: "anatolik@archlinux.org"
    ssh_key: anatolik.pub
    groups:
      - dev
+      - junior-dev
      - tu
      - multilib
+      - packager
+      - junior-packager
  andrew:
    name: "Andrew Gregory"
+    email: "andrew@archlinux.org"
    ssh_key: andrew.pub
    groups:
      - dev
+      - junior-dev
+      - packager
+      - junior-packager
  andrewsc:
    name: "Andrew Crerar"
+    email: "crerar@archlinux.org"
    ssh_key: andrewsc.pub
    groups:
      - tu
+      - packager
+      - junior-packager
  anthraxx:
    name: "Levente Polyak"
+    email: "anthraxx@archlinux.org"
    ssh_key: anthraxx.pub
    shell: /bin/zsh
    groups:
      - dev
+      - junior-dev
      - tu
      - multilib
+      - packager
+      - junior-packager
  andyrtr:
    name: "Andreas Radke"
+    email: "andyrtr@archlinux.org"
    ssh_key: andyrtr.pub
    groups:
      - dev
+      - junior-dev
      - tu
+      - packager
+      - junior-packager
  antiz:
    name: "Robin Candau"
+    email: "antiz@archlinux.org"
    ssh_key: antiz.pub
    groups:
      - tu
+      - packager
+      - junior-packager
  archange:
    name: "Bruno Pagani"
+    email: "archange@archlinux.org"
    ssh_key: archange.pub
    shell: /bin/zsh
    groups:
      - tu
      - multilib
+      - packager
+      - junior-packager
  arodseth:
    name: "Alexander Rødseth"
+    email: "xyproto@archlinux.org"
    ssh_key: arodseth.pub
    groups:
      - tu
      - multilib
+      - packager
+      - junior-packager
  arojas:
    name: "Antonio Rojas"
+    email: "arojas@archlinux.org"
    ssh_key: arojas.pub
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - tu
      - multilib
  aur-notify:
@@ -116,25 +172,38 @@ arch_users:
    groups: []
  bastelfreak:
    name: "Tim Meusel"
+    email: "bastelfreak@archlinux.org"
    ssh_key: bastelfreak.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  bgyorgy:
    name: "Balló György"
+    email: "bgyorgy@archlinux.org"
    ssh_key: bgyorgy.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  blakkheim:
    name: "T.J. Townsend"
+    email: "blakkheim@archlinux.org"
    ssh_key: blakkheim.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  bluewind:
    name: "Florian Pritz"
+    email: "bluewind@archlinux.org"
    ssh_key: bluewind.pub
    shell: /bin/zsh
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - tu
      - multilib
  braindamage:
@@ -146,30 +215,46 @@ arch_users:
      - support-staff
  cbehan:
    name: "Connor Behan"
+    email: "cbehan@archlinux.org"
    ssh_key: cbehan.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  coderobe:
    name: "Robin Broda"
+    email: "coderobe@archlinux.org"
    ssh_key: coderobe.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  daurnimator:
    name: "Daurnimator"
+    email: "daurnimator@archlinux.org"
    ssh_key: daurnimator.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  dbermond:
    name: "Daniel Bermond"
+    email: "dbermond@archlinux.org"
    ssh_key: dbermond.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  demize:
    name: "Johannes Löthberg"
+    email: "demize@archlinux.org"
    ssh_key: demize.pub
    shell: /bin/zsh
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - tu
      - multilib
  denisse:
@@ -188,18 +273,26 @@ arch_users:
      - support-staff
  diabonas:
    name: "Jonas Witschel"
+    email: "diabonas@archlinux.org"
    ssh_key: diabonas.pub
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - tu
  donate:
    name: ""
    groups: []
  dvzrv:
    name: "David Runge"
+    email: "dvzrv@archlinux.org"
    ssh_key: dvzrv.pub
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - multilib
      - tu
  edh:
@@ -211,34 +304,51 @@ arch_users:
      - support-staff
  escondida:
    name: "Ivy Foster"
+    email: "iff@archlinux.org"
    ssh_key: escondida.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  eworm:
    name: "Christian Hesse"
+    email: "eworm@archlinux.org"
    ssh_key: eworm.pub
    shell: /bin/zsh
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - tu
      - multilib
  farseerfc:
    name: "Jiachen Yang"
+    email: "farseerfc@archlinux.org"
    ssh_key: farseerfc.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  felixonmars:
    name: "Felix Yan"
+    email: "felixonmars@archlinux.org"
    ssh_key: felixonmars.pub
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - tu
      - multilib
  ffy00:
    name: "Filipe Laíns"
+    email: "lains@archlinux.org"
    ssh_key: ffy00.pub
    shell: /bin/bash
    groups:
+      - packager
+      - junior-packager
      - tu
  flyingpig:
    name: "Sibo Dong"
@@ -249,47 +359,76 @@ arch_users:
      - support-staff
  foutrelis:
    name: "Evangelos Foutras"
+    email: "foutrelis@archlinux.org"
    ssh_key: foutrelis.pub
    additional_ssh_keys:
      - name: foutrelis_buildhost.pub
        hosts:
          - build.archlinux.org
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - tu
      - multilib
  foxboron:
    name: "Morten Linderud"
+    email: "foxboron@archlinux.org"
    ssh_key: foxboron.pub
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - tu
  foxxx0:
    name: "Thore Bödecker"
+    email: "foxxx0@archlinux.org"
    ssh_key: foxxx0.pub
    shell: /bin/zsh
    groups:
+      - packager
+      - junior-packager
      - tu
  gitlab:
    name: ""
    groups: []
  grawlinson:
    name: "George Rawlinson"
+    email: "grawlinson@archlinux.org"
    ssh_key: grawlinson.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  grazzolini:
    name: "Giancarlo Razzolini"
+    email: "grazzolini@archlinux.org"
    ssh_key: grazzolini.pub
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - multilib
      - tu
+  gromit:
+    name: "Christian Heusel"
+    email: "gromit@archlinux.org"
+    ssh_key: gromit.pub
+    groups:
+      - packager
+      - junior-packager
+      - tu
  hashworks:
    name: "Justin Kromlinger"
+    email: "hashworks@archlinux.org"
    ssh_key: hashworks.pub
    shell: /bin/zsh
    groups:
+      - packager
+      - junior-packager
      - tu
    additional_ssh_keys:
      - name: hashworks_yubikey_5_nfc.pub
@@ -297,37 +436,54 @@ arch_users:
          - all
  heftig:
    name: "Jan Steffens"
+    email: "heftig@archlinux.org"
    ssh_key: heftig.pub
    additional_ssh_keys:
      - name: heftig_dragon.pub
        hosts:
          - homedir.archlinux.org
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - tu
      - multilib
  idevolder:
    name: "Ike Devolder"
+    email: "ike.devolder@archlinux.org"
    ssh_key: idevolder.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  jelle:
    name: "Jelle van der Waa"
+    email: "jelle@archlinux.org"
    ssh_key: jelle.pub
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - tu
      - multilib
  jleclanche:
    name: "Jerome Leclanche"
+    email: "jleclanche@archlinux.org"
    ssh_key: jleclanche.pub
    shell: /bin/zsh
    groups:
+      - packager
+      - junior-packager
      - tu
  jlichtblau:
    name: "Jaroslav Lichtblau"
+    email: "svetlemodry@archlinux.org"
    ssh_key: jlichtblau.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  jouke:
    name: "Jouke Witteveen"
@@ -336,14 +492,21 @@ arch_users:
      - ""
  jsteel:
    name: "Jonathan Steel"
+    email: "jsteel@archlinux.org"
    ssh_key: jsteel.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  juergen:
    name: "Jürgen Hötzel"
+    email: "juergen@archlinux.org"
    ssh_key: juergen.pub
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - multilib
      - tu
  kewl:
@@ -355,9 +518,13 @@ arch_users:
      - support-staff
  kgizdov:
    name: "Konstantin Gizdov"
+    email: "kgizdov@archlinux.org"
    ssh_key: kgizdov.pub
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - tu
  klausenbusk:
    name: "Kristian Klausen"
@@ -375,37 +542,54 @@ arch_users:
      - support-staff
  lcarlier:
    name: "Laurent Carlier"
+    email: "lordheavym@archlinux.org"
    ssh_key: lcarlier.pub
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - tu
      - multilib
  lfleischer:
    name: "Lukas Fleischer"
+    email: "lfleischer@archlinux.org"
    ssh_key: lfleischer.pub
    shell: /bin/zsh
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - tu
      - multilib
  maximbaz:
    name: "Maxim Baz"
+    email: "maximbaz@archlinux.org"
    ssh_key: maximbaz.pub
    additional_ssh_keys:
      - name: maximbaz_buildhost.pub
        hosts:
          - homedir.archlinux.org
    groups:
+      - packager
+      - junior-packager
      - tu
  mtorromeo:
    name: "Massimiliano Torromeo"
+    email: "mtorromeo@archlinux.org"
    ssh_key: mtorromeo.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  muflone:
    name: "Fabio Castelli"
+    email: "muflone@archlinux.org"
    ssh_key: muflone.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  neitsab:
    name: "Bastien Traverse"
@@ -416,19 +600,29 @@ arch_users:
      - support-staff
  nicohood:
    name: "NicoHood"
+    email: "nicohood@archlinux.org"
    ssh_key: nicohood.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  orhun:
    name: "Orhun Parmaksiz"
+    email: "orhun@archlinux.org"
    ssh_key: orhun.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  pierre:
    name: "Pierre Schmitz"
+    email: "pierre@archlinux.org"
    ssh_key: pierre.pub
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - multilib
      - tu
  pitastrudl:
@@ -440,50 +634,78 @@ arch_users:
      - support-staff
  polyzen:
    name: "Daniel M. Capella"
+    email: "polyzen@archlinux.org"
    ssh_key: polyzen.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  remy:
    name: "Rémy Oudompheng"
+    email: "remy@archlinux.org"
    ssh_key: remy.pub
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - tu
  sangy:
    name: "Santiago Torres-Arias"
+    email: "santiago@archlinux.org"
    ssh_key: sangy.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  morganamilo:
    name: "Morgan Adamiec"
+    email: "morganamilo@archlinux.org"
    ssh_key: morganamilo.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  freswa:
    name: "Frederik Schwan"
+    email: "freswa@archlinux.org"
    ssh_key: freswa.pub
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - tu
      - multilib
  seblu:
    name: "Sébastien Luttringer"
+    email: "seblu@archlinux.org"
    ssh_key: seblu.pub
    shell: /bin/zsh
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - tu
      - multilib
  serebit:
    name: "Campbell Jones"
+    email: "serebit@archlinux.org"
    ssh_key: serebit.pub
    groups:
+      - packager
+      - junior-packager
      - tu
+      - multilib
  shibumi:
    name: "Christian Rebischke"
+    email: "chris.rebischke@archlinux.org"
    ssh_key: shibumi.pub
    shell: /bin/zsh
    groups:
+      - packager
+      - junior-packager
      - tu
  skydiver:
    name: "Xiao Guo"
@@ -494,71 +716,107 @@ arch_users:
      - support-staff
  kpcyrd:
    name: "Kpcyrd"
+    email: "kpcyrd@archlinux.org"
    ssh_key: kpcyrd.pub
    groups:
+      - packager
+      - junior-packager
      - tu
      - multilib
  raster:
    name: "Carsten Haitzler"
+    email: "raster@archlinux.org"
    ssh_key: raster.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  rgacogne:
    name: "Remi Rgacogne"
+    email: "rgacogne@archlinux.org"
    ssh_key: rgacogne.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  spupykin:
    name: "Sergej Pupykin"
+    email: "spupykin@archlinux.org"
    ssh_key: spupykin.pub
    groups:
+      - packager
+      - junior-packager
      - tu
      - multilib
  segaja:
    name: "Andreas Schleifer"
+    email: "segaja@archlinux.org"
    ssh_key: segaja.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  svenstaro:
    name: "Sven-Hendrik Haase"
+    email: "svenstaro@archlinux.org"
    ssh_key: svenstaro.pub
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - tu
      - multilib
  torxed:
    name: "Anton Hvornum"
+    email: "torxed@archlinux.org"
    ssh_key: torxed.pub
-    hosts:
-      - mail.archlinux.org
    groups:
-      - support-staff
+      - packager
+      - junior-packager
+      - tu
  tpkessler:
    name: "Torsten Keßler"
+    email: "tpkessler@archlinux.org"
    ssh_key: tpkessler.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  tpowa:
    name: "Tobias Powalowski"
+    email: "tpowa@archlinux.org"
    ssh_key: tpowa.pub
    groups:
+      - packager
+      - junior-packager
      - dev
+      - junior-dev
      - multilib
      - tu
  wild:
    name: "Dan Printzell"
+    email: "wild@archlinux.org"
    ssh_key: wild.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  xyne:
    name: "Xyne"
+    email: "xyne@archlinux.org"
    ssh_key: xyne.pub
    groups:
+      - packager
+      - junior-packager
      - tu
  yan12125:
    name: "Chih-Hsuan Yen"
+    email: "yan12125@archlinux.org"
    ssh_key: yan12125.pub
    groups:
+      - packager
+      - junior-packager
      - multilib
      - tu


--- a/host_vars/gitlab.archlinux.org/misc
+++ b/host_vars/gitlab.archlinux.org/misc
+ansible_port: 2222
 filesystem: btrfs
-additional_addresses: ["116.203.6.156/32", "2a01:4f8:c2c:5d2d::2/64"]
+additional_addresses: ["213.133.111.6/32", "2a01:4f8:222:174c::2/64"]
 wireguard_address: 10.0.0.5
 wireguard_public_key: EbZisS0fwM6B8Nkugy1lyox+A8L13hniucVIPVCK5R0=
+hostname: "gitlab.archlinux.org"
+network_interface: "en*"
+ipv4_address: "213.133.111.15"
+ipv4_netmask: "/32"
+ipv6_address: "2a01:4f8:222:174c::1"
+ipv6_netmask: "/64"
+ipv4_gateway: "213.133.111.1"
+ipv6_gateway: "fe80::1"
+system_disks:
+  - /dev/nvme0n1
+  - /dev/nvme1n1
--- a/host_vars/opensearch.archlinux.org/misc
+++ b/host_vars/opensearch.archlinux.org/misc
+filesystem: btrfs
+wireguard_address: 10.0.0.42
+wireguard_public_key: 2f19yTsYkrv5xp7V4kREsuisbFc7Wew3gxd7sS/LyXc=
--- a/host_vars/opensearch.archlinux.org/vault_wireguard.yml
+++ b/host_vars/opensearch.archlinux.org/vault_wireguard.yml
+$ANSIBLE_VAULT;1.1;AES256
+66386538386463623062666662656563383738343831326166383361333365383231663232383662
+6530633164346531613431343530373334376437373132650a383731653464626236346265346638
+35303861636134663839363236626335303035633730363339613331643535323938356436373065
+3266616166663330660a346338303830313136386338323135353563636539393261616562616262
+36326438353233316661383231613639393437616336653734613330376334376563386231346334
+62313733313265383963396665623566623232346363633566323439303466383835346134353432
+63323039643932643663323538383563623134313730653336623631383363346239613038633030
+31616365656634326339
--- a/hosts
+++ b/hosts
 [hetzner]
 build.archlinux.org
 gemini.archlinux.org
+gitlab.archlinux.org
 secure-runner1.archlinux.org

 [equinix_metal]
@@ -110,7 +111,6 @@ bbs.archlinux.org
 bugs.archlinux.org
 dashboards.archlinux.org
 debuginfod.archlinux.org
-gitlab.archlinux.org
 gluebuddy.archlinux.org
 homedir.archlinux.org
 lists.archlinux.org
@@ -120,6 +120,7 @@ matrix.archlinux.org
 md.archlinux.org
 mirror.pkgbuild.com
 monitoring.archlinux.org
+opensearch.archlinux.org
 phrik.archlinux.org
 quassel.archlinux.org
 redirect.archlinux.org

--- a/misc/vaults/vault_matrix.yml
+++ b/misc/vaults/vault_matrix.yml
 $ANSIBLE_VAULT;1.2;AES256;super
-35613634663664333031646136623735313137313632323563633736663639666138356136353461
-6632393662363437666638363734376362643366646234630a306638643762373535653334656665
-62646166333735316466616565636639323361303530303465366564616337353433366436386230
-3531633635393531390a613834626134633163343039656631356139333935353936363131666535
-64353965653531346563396230663630336561666531353362336539643638633438343239383764
-66646136303030633461646338653137643435396166313735633535313165633466316462633532
-62656336663932326262326238633563656463306535663965313233376239316635633137396165
-37366632343565386630613037396631356436373838373136623039643362393135383738643033
-35333564383462353635336662336535386162383662656463613430333639623063386138386362
-36626163323863383463623034356665646330376630666133326338613639353734656361663565
-62663038383165656639346136373763363564333233636331303966306632393832313961393464
-31303063323936653438646334316533656431396232666533366263343932346130366337376162
-62396131313461636563386138376437633130316630323261653836386535393635646238363831
-38386361343561346366306439313064626131363832646631346564323232643135383931316266
-66333566633339636561366262626164353863323838313833653666356163326362316338633633
-39373733336563656638333965326262663661383533626265623233303261336266363337643765
-61326163383434613366336661353133373831313537333131323438346436633836313337393763
-61393530626535313331356331363733343238383838343537353364353730623164373065396465
-34326530323832343733616264316334633761363666326139656366323831623036386630643462
-38393963393262646163383733646662343337313336363663323462313038346330303138613439
-61303639613732333039663930663763343630306136626335633033383537623134656231666534
-30613433643131346131353632653833323737396137313334656130323632336366663861303134
-39363763393436363261333531626136386238306465336236333234336564323866346462653330
-65313066393935323639653861303137383334363734653761376662373963626439633633333663
-31333339333338373431316661613165643261633639633861356537623230666535326233393466
-62626666636439333563633434613835646666616434366435663261623730656236336333323739
-38346462643230623961623562373063323139356334363561306435353165326232666665613836
-62656665333261363436353730363336663533313231353162633066323932666332643839306632
-38333461333938383266373837316166333239343465333934343963383563386161386334386462
-33306262313961643766336239393963343836373464633866643339353038626238626332313439
-63613337613066303061626162633834623331376337613632306431306630623233613931643232
-63663434313936323731396566313165393839353362353135616261663564346461346235303732
-66346564313930633539316666656135363962363665626238303730383036303665363962653033
-31306266616365376536323663356565383732306537656661656665653439643264623635363238
-34653633613863333338313037626462313934333437313530383231303632353262663734616436
-37313164636566633962383561643532366165643937656462666565363862633463366431363561
-64313162313733343138666532373832633935643866323839653533313364623264346232366664
-33346230386138373430633265383561386266366435353233643866326464313730363034376130
-30663331363933343763343539653035643033373365393465306339656261303638636337643733
-63616161336133343832623439663033646535353534386364633735333936323039666534383437
-30313237346562646534353866663031383266656464333161643831636562346530646432353439
-65313765623430386331303938396539313731643133626266326530666565343035373237386666
-63383231643539663635643761653863376639636166356564356638313030336634366639636334
-31623432313736633632313564333437386664383661643235643835363866393033666437626336
-33653264336235323861643731393036373362343535386461646430373036303863633234623536
-61356531336664343035613436353835386634643062653030303838663266333632346265626663
-64666361646130623039323539653339626234613439346132623166666434353731373634653465
-64366433303833393931653262663930643865383531646137303932373861623061306638323234
-66316639626466393164666435326632623333643137353465613934396463346137393964623330
-35656666616561313832653165356138643537666438626161643131323730356336306239653035
-37313935303935373964353237396662626437333035313134386662383264666234393830653035
-62633030316462323731393465356632336132663739613938323563366335303737393638306637
-34306233323662323935656462616463663135623736656435396266623439636661656161373735
-63666130343333303939633766306134343062613031303238643064316562396261373732376664
-38333766306262633638376139326665386632653330313838343437326661353932633566356639
-66613030356361316662343738623833663836333038393364656631323936343836323731323133
-30306536366131373033653761313661323431393264636436613332393934383336396536393131
-35306538663735383262353133346335353965656630623637623335623837313333613663666662
-66386263393365663332646637383466333731343062366562303833623333636363666565613436
-38613364363933633661666263633837393437383238316465333435623838323734303936313735
-31376239363333663937643762343636373936373738323161663835366339353030383634323037
-62333434303833653962326539613332636261323037376339616433386562313033643865356662
-63353730353165633066643934343365333964643961393538623661633439323466376233396630
-61343964376365656433313363313064363439366333613461633565616639383836393136333732
-38663630333865353133646435303334323962656464396330376664633936326437326437623938
-63623162646532663337646536656163383366383531373731303837393166386366626139616561
-33343131363866623162623063396237343333393261343434303734353136383936666466326266
-36333938656364366139633765323630636162313531653738313334636631633561336132363462
-62393163353665323939653064363566383366313239313436313635323263373738316331313233
-31633236633061343163393834323130356139656438353939366336646133376538303363303939
-64303861376434626162353939633338623134663336303162643363636436636230306262646635
-32356465343938336365363164306537386634653863393537643030613461313437306162343137
-63663332303131646235383934313137633236316532306434343266666233643161393265393030
-34366238326533653432316532623461343635323762323430623130613130373833343531363239
-66653633373931313863663637363639376137663236663533646538373764356336396438346138
-62633934306465366463306235613233396432316164353738386239326539643165636361363035
-31346434643639646665323364356363383064613464666565656336653734656365356631656430
-62306261613963633461646431333533613463326339656637366661386335366333343434326463
-63316133313936343538396563333961653933383331656532643465623035656163643230353331
-61376433366433346363353366363061353864636230326539633265663362343235373532356639
-38633666303837666331353834316337383062353565663565373732306430353334626466356436
-39373630363264656231393661323034313863343731613130613538356534333939666133663034
-66306162373666336233356666396134636265333263323736626165636235393231376262373733
-34333730393138373639613538353437653631626466313539386263383333336532346265623666
-62623435653835323431366365383566316139393764343736326639613163353639366139656434
-64306432653661663639306330373133663536663461386235326636366539656262313130623565
-34633231633435383831363830343138383930366361393837343032303431396331346538343234
-32363264316263643366353835303138623066373265343063373237313230333733396263366166
-35626438373033356130333866393834613136646233303661636365376330643438386537633831
-35643239306239316630316537613563353530376265313030633534363533666162313831353832
-30616539626535666566386164363537366136663833343939633333366231613634623330396363
-61633537653836326337363631636564656266623065323263323731316137333564316364303364
-61333164313039383636613061316465623535363430653561633763326531316436376262353030
-39373133656439346664366538623930623566393637303664353833373561363439373733336139
-31663563613664643562353032653966323534303535323031386633323434633338613465366531
-39343833333239306138653763373534366465333461396538633337383266656134366230643966
-64306139663433346239626666653164613833373030303039323563633630633131346139376333
-64303438353765613361393465633363303431616238306264646331653263656133386636346237
-33376234633966366163653561353265633330303234353230326463313534656462623730623939
-63336230323633316437376466386634616132306537313132626464393439636539613064623834
-31326231303430393138343038626334346539383862666164623236653535623463663164316236
-65643632656236633565623333363833303938663263373732383665643436336638366565363062
-65303163323339373530323563663332633132643766393362306633303664376432613332313338
-38396532303036316535623532373764666265333531373034323437303130643630383036633337
-33616236366530666565653564386139326464386565376234353266366565653133313761346665
-36363734306265666639303562653633613432313431376339373636353833346565313537366136
-37366437386337363432303837346661316666633033653039633937613834633731363332613630
-34326632613965333035313932653866613334353637353161383665633137643561393935653136
-31353737643339646566376539396532613364326231643236313637383538303731396334313664
-62373762653438386462323734356564363837633864353330613337333839653130613836333961
-33626139356637643165616234333164353439353461643431653339383331656439643935663866
-37303630636339383837646232663939323138396338383531653136313932626437373237356635
-33323238643836333532313133383833343030653232333532643337333132656631343333616132
-39336564636131633664643235353461616134396638663335656264626238383066613231376662
-34306266386161646431623063393738386236366366646262303864646236386466386663303962
-66363738346365306562633537306536613362323438353235396532656166373439336464363466
-61623565653437373865633339343639363065383538663265663963306436343830653264663432
-37663261633239376162333931623263343064343463336234343933356166616131613665383832
-64323533383362636537333231323663386536366133396664653261656461303436396634336637
-39303137663561336163633336343734303236303162333963376564393634303264626631653630
-30386131343332366533343166613063636363353939333763373630313435336536663131313362
-63343261333361366438663265383936636332326535646133393235346538613163633335616135
-61313331373961653439613432353363323066383464663365313166336234356163356135323363
-39356637343332373235653338616238326638643362333532303434306562343136613131623664
-32353939386161326236643465356133643334363836336638623362363337306234353938396161
-63323833326330666564636230653637646530363930616137303636666233646334373462343861
-38336662636338613338363430353761383432303164393830626536336463363332373364323334
-61623734383665383231656363343939663865616330363431393533373566386562393566633161
-65643433326461313232636230383730656363393831333761316463653737623565643832636233
-31346132323963663638653962393038616232326664313862366635386131613238323332346666
-64393665636430363566343765303532376461383630626430656632643065376564313930353632
-37393339646233613161333336333639356361636231346365383037616131613062633064353839
-38333338626631613830643234343863323166383362616665646238333734613732316233313662
-61373065396364383436616339336662663736613961366136316562333961383137373330663037
-33353930636664316631373036616366633838636639376336383532366133373231346330376336
-39656534656438376264396164373261356333613737376663373835666663346665633161366333
-61343231333135656361623366666562326662643532386664653366333361646235303039663164
-64323461353561383766333263663733653837656130373863326166383433386539393330363034
-31633835663862663462366664633164323838393064363036633438353964373433356163653531
-65636139343733616539653164386364306334366663376434666130346632313539383935626436
-63383263613364326265653537313761626162663664303338636261623539646138363631356431
-32643332663862623532663232333762396461333665333536646363653261303862356330353866
-38303132623461306562326261613664303734343937323535353934643735313131336135663530
-66353630363838353162373661363038306335646131633632333636353662613439613565616562
-32386334313636306630666563356366316161373663333461633539646437356536396237636566
-66663333303431366561303035383837316266393337643763643366336238306466313138383461
-37663034613165363832633932383334343361306134613934616338393661666330623130363138
-34393466363665376335373935303532396332643562623431303765346330333137383232656631
-36643466306236323435373465343864353266613463333238383231616362386461323731636339
-37643764363439303732653931666234396438376538633338643065333431623038663033333236
-32326131636135363739633733323433353730333639343333326462393762663765376663613435
-33613438383062313135636636333036366662376430636135356432616365306363643661663535
-66653166643033643733323335346135346637373363626434383739343432393836646664386432
-36643461616466343463613539626461396335346639356636636265653431643837646337396534
-63303966663838323766626432666165353836353236656438326230323565363937663064313732
-36633636313734346461646564626632386561323466346633346439636534653639363836316437
-65393063306630626439346533303230356234633265393837636135653935386137373661643461
-64646665393165653230326136616132623233623132306266653863613361653439303330663235
-37313933376261303562643831646565323166313439636539636631636165313065313834366234
-62333935346639636137363865643663376433303263393836366266633239646338316634323966
-61383561323265636136666162356130343033363634366663363863323830613362353031623934
-35373263623935393835376264613833373730333838323831346363643034646237396438663738
-30346431306632666137383832633138356637383364333839373264636165366561656163626231
-32316461353137333933636635313261363938666234363866303563346466616434396631626564
-35306462336464376637616438656234313134353034353961396434613738346632376366633036
-65636639376434336636626363633635326131396337316634333034646630633532383065313836
-34373432326132303137316465666539646364643335643766613265363232653365376632386364
-62356365626436373365623236393339653937326364353263366236333364633736313064323032
-34663032383364616437366366336566346463656233386139656235363562373234386263373832
-30653465333931383166313132393866383637323238313961396236373234353331663262366334
-35343939396366643630633335663336343837623135343131306566353735663439626165653531
-37386331373334663431303634316163643330643165326163643163353331336162356139346361
-64666536636561663832386664303364383838613731323038306537356635663961643936366564
-31343533663435623136656261643063313839343732303164323161653835343937333334323633
-39316437396136343463646665386631306664346638366463363735373336626338336234363938
-65653938653436393033616234333732653038363837313466633461323961393865343234323361
-34646131383031356133313035303235386164313766663833643366626237336363366261643062
-62633038643732393165656361653561346164623130303766323139316437333339663565333661
-65373664316534306435366364616232383934393230633331663364316536623436656539343163
-34353665653366306261613136366434363939303339373261346632396461653939323230356136
-38306430656361393738646136343132393663616436373939303230613039346635333762626133
-33336431393533376538636537373835653936656133346332356362656336653534386266663737
-34316439333133653366313834636436373636653536663831633061633065653833353962353434
-31323665396234643236636662653238393436336461396261653234383536636466656336353935
-31396536356666323062626361376637366661373738383333393330653332316238643361623965
-36323263363433626139373934386637336363333236633163313662646663633432393361376438
-61623035633132383538376361663130323466623666376539643364636431363961626664613463
-34636261373037303439356434303035386636623064313734633264303464633038393461323432
-39353366623362666433353537373935646334653237616165656662643035316261326266613738
-61626230663338316464633137373830326532643362653637653133366661393737383663633039
-66653934633664343837633930633730633731613262333462373138336662396234643932333862
-36303661373039336436626337633936663363356638376335333135336436626563653065386363
-35326333646130666233633635346235356265653139346132386265326234376532346332386335
-34643235353261613166373066363062313139613039316166646533333764353234363836376534
-34303564313661333963353233373237343236616134353430656263336336313434366664383336
-66626264363937373065306636366239326266323033333763376164333934326535623938336634
-63376633376538373861616536366534323234393136313066336238386664653563333862313138
-33633332613262343931313236393634303864376538343934363963313937383764393634343438
-38346634363635343465323038663938663661333565356134313837336132386565646337646637
-61373662663862393034663565373065333336626233326635636263653331613233333539396232
-37393463653437383038343933613631326537333165663833656464343432386233626166303733
-32306130326136646536653937663637336536646165313662303637383731303931336565616131
-66353561653265633766653565383430643130346437313239376539363837663639656234663139
-64346236643835383431316336396638633265353235313961626365643132363965353866363331
-66376238313064663561323132336336333530633366613331353432643964363237346162323261
-31613663636631666266633066636133313134386133396432343061633030663163313235346366
-363165323431396633386631366531633064
+32653564323062366161646338353432343239303336353636333437383230376230316432613531
+3262623466633664383761363036373066373439326561650a366439366634383465633937303765
+61343965376664613337363236326565623330646661303033343165326662333462643465633533
+3130383935396562630a623231303065333138383834616232663836386363346130323733656464
+66656163363364666632636262346234633962346663363936643563383764316238396466653161
+31363961666361666466643133303666393537633330376636396231386136663065613932383935
+63306430643764373135356666623839643931303164373439663430366439643237306637646638
+30393831343739616237653862653162366564313439383761316363653432363963343731303937
+62623933376636363536633134353262646137366338316132623064613866623633353965353262
+39616263376430336134653038666563643964376563636664306261366533373330363830353531
+61323332626532653035383061666361346530323262666166653937653464373561616632306130
+35346634633764656633363136383966626239613666643038376339346230616266666262383362
+66653235383731616364393937313263353665363761663133333234316366373336306431623164
+36616435306334623236363863616339643162383565333037623664303330353764336133373964
+30666262623766373539633966663638663836323661353734373663376138656238613064383565
+38366337333730616635613338356665383339356436626535333065376666383461376261316430
+34626435333234343662633537333465663764363036316464616232316232353062653765636662
+63636230386137306135633232626138656535626363376163663835383161343261303363313430
+36373664323234363562626663396563356233313539646664353164626464613464663830366139
+36633062323532346261373838633565393936616333643434386636303839643364376236643632
+30653038333434636437393561393737386633393663336266646635633866643832393863386437
+35613564313462616366626462356461346137386639646134356261616633356663653661623737
+64303461366562653833663237636231633839313838653339613961613838333535373335663763
+33363134323363323832376236643431336539613066633362363030613732333662303437303761
+30383635653065326263363936336531363666636137306639323037666234323238643435633935
+34363232663739306331646635313665633431373165623362656138633165666661666236373061
+63373639626436386662336538346336366165663664616238313138643734343031303061643837
+35353938356236656337623833626431373866376665326264353032313663366161623638666630
+32666365386431646533373338633166323835393233376135656633333431656631383664373638
+37663931666331656164353065626662326134636462383163636138353466313962643438613033
+64316335643561646562636533323965323134373062353562626164353966393737333630623237
+35313262363035333266323539643530343665656463343363343834393635636163313734313932
+37663838323431386237333035663930656637353738386266383236393065643135363166376437
+32373932313935323234383332363433316138313339393164306532643734326635306362636462
+35613661356330653839326138643735383065306130346431643834393466353032353734326437
+65643239616536393634616634633533326134336465316663646238333335313766323134383931
+30373966316136633763303838646565363032306166346163373838396237616435666432333764
+62333436306264643466363166316137643466343539356539316537326632363262383238323163
+33633265646461616434663634313134623362663732646136343261623433386631363661616536
+61356631356431636335313365656237663131373736623935633063306666383961353263356264
+38366363373463666338396434393766306138653962393538303763633532363964356335356438
+31613864663733356130616564386332323036653564623332343637393531653865666262393239
+63303661316361613264366363343765346666386563613839343730383762336438633063323330
+61333766366530303262396363633431326163633830326630653331303962333135336165643330
+30663264313335613234643732393433363732633136643930303035663432333736383438323163
+63663631373334663832313466383662643366643463663463316136383430626463373438336139
+61346332666162636230356563353134333335356536626262653132666637333630363562313862
+61316430616537366161623838313666333535636632626237363837333761656165646634656636
+64613635636235616336366162653438393039626230383161303939613263396465326532626435
+32363035643338303936643562623964373639656333333130653830643837633139623033343362
+34616630376135346339666663343962613134373765376535616334643131663137623038336230
+62343035383130616164663162303238383333316662323038303730393836323836333961663036
+66306638303436333531333833343165306636316166383864356239396361663464383938306634
+62306133633333663538636430346130643630616665393930323732633863616133303634373138
+31356638353737313061333631383366316163366362616631393165656338636537633635346266
+66623732363232656230383962613032643937333664393035656231333063653138356531626265
+31643266646265623035396330623265353364636362376439366462326664623161376137343935
+36623964646230353262633439636563666432623730616538346538373365613165353062666662
+39393366643633393162623430656566643632336337353765393739633364643035333330303135
+63623132343233383736316333616261303636306464376332316438313762306332366232643237
+31376563356438633931333431653837656530363530623931623661333961633035363731323631
+63636436613764383639653662333231393233323462343435616330386162663331306639633335
+64396137323364323366383430326337363062363334386338313035386463353431613035383765
+34343137613064623833386562393139623335376531613163646366643063613033613762653336
+61316166373936333566366439636437383738663836326633323337326339326432383732303435
+35303439356665353433396333363538333830393664666436653139333533343737393036346466
+64376262626264636237663339393138376662626232303163346437656339386337363832613838
+64303833653035363666386331306234363139323437343535343164366162656365383733303332
+36346639633432306231323531633365353636613934613066663866373863353036653461346162
+63353831353933643838356364346333653232323763303061346636323330626336616331636661
+61356130316134663062363365626464343032313263613762363463623939376637373531353037
+39376535306331373166393366373031633436313963663365386430653630303363366262666366
+33303332306137366233393163333837356134383132376232303538326330633265366231636664
+62353538373530346538666331366137643065393838373438633964366465613734636538353632
+31366437306261323161626662303664393262363838393535326535613336366632336339363264
+37643764623962633839613964613439356231363039313035396362613836343963373634666532
+34343230636661643837386266373039623035633935336133303832326433623763663337373634
+32653431336134323338383338353133666263383964646561633934353235396431663136623862
+31616335646362626633336466313536663661643335643565663133653133376630623462343966
+61336266353235336264633133633263646362613562633236393834393662646238326239616132
+38323331323932646436363161356666343361396439333233656136323237643939363063613230
+64363632313963396637653562633864636636353232353232316134363463336336383539376436
+34303138363538376264623964313564343835666332346636616435393834343261363039366462
+35643839333631623362623464643431636263616665343862613465326632613232323533653161
+38386131343436386336316465383638656135376637316664646635383333396661393138643333
+63653266633263326532363135623362363234663439323133656333373261346437333865363435
+64616435336532663537376361393564633061616138326264343436383338653139663161663337
+38356264633830353137313065623164316430356131333161643162363563613138373033666561
+34376338343030343536336437613266373564623234373035663136623034333761323935353730
+65626337376231656338386364326264656337353666333032363463663965356661666262376534
+63656533643535356363636662643666643837623832306665313839373338316662383566663266
+63393030346331313361623136626262343638646132346336346333333861316434656265303166
+38613537343461376434303136313839663230366132643435306139356534386265613833366430
+39393738643634373034663237613833316431326431326330653339666535623131353936653539
+35323238313936623137336339313235653237363736376533616463303534333433646232626665
+64373136323565653136653433333466666666666633353431386235373531623337396562616436
+36386532656664646561333338386236336330353336616130373130323439643633656632313864
+32643632663234343536313031353439643636393233636464336532336334373532336263383933
+66313565333932306361323462396230373266333530333933643465393032373338643237643035
+63663039633434396364353432356336353064396636353633313136376231396664613561326266
+37386532373263643230363665313830636532396663616234386438363138633133383031643262
+35363735386438663138643838653535626361313637373534383062366334616236363437316163
+36643739643336623831316465363930386463376236373934336539333830326634363464656631
+61393934666232353431313737626538366662383835333863636164383639363961303637633536
+36366332346530343734383232396164663863323335346366316466626265366236373263643039
+36373232313264333636633836303836326539653466353232303532366563393532666465356233
+31383938633265636338373630616336643166313763646361386332316463303037303866333866
+64613836663631616433626331656537323761643035323531633735626531386364366163363463
+61383732643939393266666533333334613837386332326531613062666232633833336561323439
+38616434626664306164363363663263346563393331326365316434323635623632383938663031
+64363330333732643433383362346536373132343565303462303965653038363962383662323161
+33393231626334633239313737373333613662613738373437613861303535653533666637656666
+62363666353764346431393738626166336639376664303962303733363637333463323433376435
+61313839323161616538313463626537363631663562653238316361613930343132336665633162
+65373863323366643235643737353938323833663234633531666666333739666165316131366461
+66303233393037633564336239663164636234376139366163386666646331353965623261323863
+64366431326534386233623163323335636437313138613937313833613030653365623262363135
+63616532306537653665613231396634336665346662383161336532373065653732303135363761
+63366433656634333530333439353437636463323835316262646332656430326332356462376136
+63306262633232636530663030343833653735386333623835623938313364333663346136656162
+35623135393061326330643263366465376438313161346436316637333366323933343962373663
+62313433666365663565626638316135373839333238643166323265336464643338663961383931
+33366662303132656166626563373666643334323861366365633939353237633533656663353839
+39346133306662613138633466613139393433366662313831633632366233373634306562356637
+36666631303837376132373733643536663465663338303931323266393437316630636232323430
+35353333396533613863653864373565666239336161646161373433323236643635366635386132
+61356130313936383061656337623437616635383735353065383137373235376532653364626636
+30306435366432623637656465313630666131373966323434626261656130376436373963656565
+36663539653237333463653530313963306365623839616532663630333735303061333265336138
+36633534616166353736623762336439653630646564386137313366643433623966323937306135
+36643065313833666164633635613366613939386537646633363534656232343461656235303139
+38323661333530316633656530323830636566373434383137353030363231326339643939313433
+33663062656630363366353437313366376538323937653330323465363433656436616661666563
+62656638316630346539656464653735346334313834316633356633613633343630316435316239
+66396665653530663266326462393064656536353261303239366564323034313539383138396135
+36643464353066393939346130653063643638333035323837313531356336363939353732363839
+32643437303564396166646132383239303231323231313961396463366330643632346234306232
+35346431303362346134626639363339616434316333663338386232303066393561663832343337
+63633339636435623865653233613732623132363563306339316137326263663931626134353538
+61653462373730383437393662323439666138373362326161316433653064613638316337656437
+61623763303436326335616432306664373938326231626130343835616666626566383638346634
+32613935643431326133383539383933363331666265393532373965613530373039386632353436
+64386637326466363964633463326237373936343934656665306132663530376637346333303237
+62653864656131633735393361656232623766333631316538653363383837633730356334383662
+34373332653231313333356434613562393335623463363739303330323534393861333932613465
+38376662636635323130306438613937626438363330656239323931656631333563353434643734
+37613032326430313534303534376532623435643539323965363766376264363133373163663531
+64323262323561326130656461623231336637616232646137353066623064333164316362336237
+64393030623736323630656539353034666366633136656564363566356430623233363565383830
+32326330356561333136316134653264613865626462313937326634303135666133383033373734
+65633364666633613335383134656531623736373835393164336266303231653865356263633238
+37356566626534373863366265313237613062636461373065333737383237363366346533613137
+39383963363634616231363834383361636235613539616164616537616266333535633533336665
+61343139343139613832326337656335396134323064336163666133333131663833383066383735
+61666539663235323936313431346337366361353639353538353965336334323561393336353331
+33336433393865663138336134396235646138336466396364643564643062633166303530333135
+65663165623339366538383966363462353630623566346339366439666464646363613362386236
+64336535616235343261636462346531363131633639633838666232363832343530373534363965
+36323832383463656633343137356463346630333932393937316562326436313166326234323033
+63666434376362333131343633316565336365366437346330636231366265346231386636643532
+62323565663031626263363866336538663564356166396435323731366437646161343062323733
+31333436636132663133336635633835343130623664333734363037326234316335353836616463
+63353239373963356230333230383137353863346635616565616335323531626436643135616239
+66663061313361323161396633626534653465303033623533636632343164376630353534623563
+64303034663331386231323962613235376239373433363032386236333465343966306162353331
+62393735636530313636663866343337616266353133323536376164373266333161306661323837
+35353031373662383039636238613363376664366362636639356361303461643662663363386430
+36346562323466346432386362326436313063366137653963333130633861356439666433363265
+37393865353838306339376663363531646364653064383939646565393263376164653234396163
+31623462316637306138343032643537623464613737353938363266623137393261333337343638
+64336131656364313235623865643666666164313863336366336435663964383836613039303136
+39363638396134336363383963643437356433356363633738613431346632656236303736366263
+65356366373265386464333139356339633338383130373464623863316563336564643163643462
+66636638343262626537616663613235343437623666646534393564336566653335386235323863
+30663236373239376166343161336233346236303334663865346532326230313665653666353036
+38633765333664666339353964386262633632376132613331346430646666326362323862303565
+30306362373631623838663835313638356362646437383366383766366135396463376436663533
+63656562366433653763656634633764613261656238306237626565326631306362376137386265
+64616236393634346539303131316361363965663333313830386135393862353235623336386430
+34373465663663333638313064393532373362303263616336663736613963353133386236356333
+64326434616330363366376235306161333233616361386231643165363939313939303733336631
+39656131646130653065323566316338643538326235386236346430643961343131326133373362
+37373262386537316637323739663064376362646230366530613165623664333137303139316135
+32356363633334653138393237323233386335383864616636343632396533346364346263333765
+63393737376234656461623539666435386463396635363434653932393330323739393631343664
+30643432353535636638616533613966633133663836396530326434333165623864376363313931
+32633532376132323837663064656537376566636434633766343737623936666661656461323430
+64333537383134376335656432323661363232353266313033326364316661626337363562383338
+63313739666334663663333138306534383461633965316538363763633432363732616134363938
+39663237323363306532373839303531326639643139393262353362353532396139386564333031
+37333566383537386433373761353335386330343937323832353230616662633665386562366232
+34393739636563303531663033633338353739346232643666333831326439373934343430613538
+35653839666438336331333636316361383434326230373637656632363330653431356361343333
+61653061326366333639613134613630303163626364623139303235303131366636373036626337
+36626630366132326562306535363063336339343034373730633532356233396636316561313639
+34343966656431343835393165323530636639666261653066316339613435303634656165613635
+39306665656366373636326231626262333539343433613033353663396232613239646636346566
+66323532383063313932363761373635346562666664363730646237336539313035333132396436
+34646662653735343661386662306236623331333436643032643566613434356239623065316431
+61613939393936666434653966326638326538326362636666373634386361346464633762313638
+63306162353530383134363832663535303632663539613232326437373332646635643337623034
+39303237656163353833613638326135343162623062323137343431613837376631636461333439
+38396133376135636334343364326661346130393232633661373765616634393831356665346165
+66346638343738666237636532373139653863333337373461663665386464653036656633386337
+3739
--- a/playbooks/gemini.archlinux.org.yml
+++ b/playbooks/gemini.archlinux.org.yml
@@ -17,7 +17,7 @@
    - { role: certbot }
    - { role: nginx }
    - { role: archusers }
-    - { role: dbscripts, repos_domain: "repos.archlinux.org", repos_rsync_domain: "rsync.archlinux.org", svntogit_repos: "/srv/svntogit/repos", tags: ['archusers'] }
+    - { role: dbscripts, repos_domain: "repos.archlinux.org", repos_rsync_domain: "rsync.archlinux.org", tags: ['archusers'] }
    - { role: arch_boxes_sync }
    - { role: archweb, archweb_site: false, archweb_services: true, archweb_mirrorcheck_locations: [5, 6] }
    - { role: sources, sources_domain: "sources.archlinux.org", sources_dir: "/srv/sources" }

--- a/playbooks/gitlab.archlinux.org.yml
+++ b/playbooks/gitlab.archlinux.org.yml
@@ -9,9 +9,9 @@
    - { role: root_ssh }
    - { role: gitlab,
        gitlab_domain: "gitlab.archlinux.org",
-        gitlab_primary_addresses: ['159.69.41.129', '[2a01:4f8:c2c:5d2d::1]', '127.0.0.1', '[::1]'],
-        gitlab_pages_http_addresses: ['116.203.6.156:80', '[2a01:4f8:c2c:5d2d::2]:80'],
-        gitlab_pages_https_addresses: ['116.203.6.156:443', '[2a01:4f8:c2c:5d2d::2]:443']}
+        gitlab_primary_addresses: ['213.133.111.15', '[2a01:4f8:222:174c::1]', '127.0.0.1', '[::1]'],
+        gitlab_pages_http_addresses: ['213.133.111.6:80', '[2a01:4f8:222:174c::2]:80'],
+        gitlab_pages_https_addresses: ['213.133.111.6:443', '[2a01:4f8:222:174c::2]:443']}
    - { role: borg_client, tags: ["borg"] }
    - { role: prometheus_exporters }
    - { role: promtail }

--- a/playbooks/man.archlinux.org.yml
+++ b/playbooks/man.archlinux.org.yml
@@ -15,4 +15,4 @@
    - { role: promtail }
    - { role: postgres }
    - { role: uwsgi }
-    - { role: archmanweb, archmanweb_version: 'v1.6' }
+    - { role: archmanweb, archmanweb_version: 'v1.7' }
--- a/playbooks/opensearch.archlinux.org.yml
+++ b/playbooks/opensearch.archlinux.org.yml
+- name: Setup opensearch.archlinux.org
+  hosts: opensearch.archlinux.org
+  remote_user: root
+  roles:
+    - { role: common }
+    - { role: firewalld }
+    - { role: wireguard }
+    - { role: hardening }
+    - { role: sshd }
+    - { role: root_ssh }
+    - { role: prometheus_exporters }
+    - { role: promtail }
+    - { role: opensearch }
--- a/playbooks/tasks/include/post-upgrade/gemini.archlinux.org.yml
+++ b/playbooks/tasks/include/post-upgrade/gemini.archlinux.org.yml
@@ -7,11 +7,3 @@
  when:
    - who is changed
    - who.stdout_lines|length > 1
-
- name: Stop arch-svntogit.timer
-  service: name=arch-svntogit.timer state=stopped
-
- name: Wait for svntogit to finish
-  wait_for:
-    path: /srv/svntogit/update-repos.sh.lock
-    state: absent
--- a/playbooks/tasks/sync-ssh-hostkeys.yml
+++ b/playbooks/tasks/sync-ssh-hostkeys.yml
@@ -16,8 +16,8 @@
    - name: Fetch known_hosts
      shell: |
        set -eo pipefail
-        ssh-keyscan 127.0.0.1 2>/dev/null \
-        | sed 's#^127.0.0.1#{{ inventory_hostname }}#' \
+        ssh-keyscan -p {{ ansible_port | default(22) }} 127.0.0.1 2>/dev/null \
+        | sed -E 's/^(\[?)127\.0\.0\.1/\1{{ inventory_hostname }}/' \
        | sort
      environment:
        LC_COLLATE: C.UTF-8  # to ensure reproducible ordering

--- a/pubkeys/gromit.pub
+++ b/pubkeys/gromit.pub
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6YsLTOo8SI57c8I0DAmdmB+6MxbH6gJepoCQ8vMSOsAprokaP4sw4m5d5mqjsHwxLcLE30bnIEDFIzSrOxCvhOX6Zi6dErUMUaOYhbcOTbKGhHUpLfQyh8jHJx1hbV0QrGL6tRU/aS/tDRbedeXpKusCaocltWllFJj8Fbaw4qb8HSWrJMXMfSlTQ+G78WkgMGvLSyOEbVKKOyYN+u7lA1GUt5/NOlujbmGBbLWAeaz65LegzP84SWMcCnFrN5ju/VNwWAi+kaxsIRikA8W36dtP4AO17IoarP9+efVpGeo517dW/1fvnCPqDmaaC7wwOhhGbJ/Yz2QK8kSFXJUT16Y2W5O7rH2KzitXIX/JkQAJlgkLfdH22ToyiSUZoG/RFpSxorpkdHIIZDkh5yuFQwPwukL1whks4CJncz3JVZEvJUey0utxNbVcmZ9Viq2BMrojJ3fCb58Aw7C81YM7q4dQiMCQ0Ks4osXAPDMLnPnh5OVMhr3vVDl/KOF/Ar4TFqagypOmdZbkNa2qOzJWBFRw9R8G6Q5U1c2d3GiRWfpHz4YTtGc6/d2WYJbnPL0/fx1+K/QS3FojZOTMXdDLST3XaOPhedJB99EXB4eE0W6Vy9/9Isb/YnGpTkgFvtW8+swoCW5SpgKbYrDo3IICt1N1ajb6JZqqGI3aHl1WepQ==
--- a/pubkeys/serebit.pub
+++ b/pubkeys/serebit.pub
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDF32tlSDr0Ze6owld0p8LCwFT4ttwy99qfDERX/Ntlqobtr9AsZx4FMHToLwhehJuhpj3hzmlmHtRyqF1HnTd6Jrxk8jTmqYej7QpOIZSEmkYwUZK8optnWFIQ/Ce+t5InkJG/FoexXTXEOCegVdZmCyS7Rxr2Nt6v9EDAhYXb9strKROVYy0G5rNisu9aLPqTLEcpbHWnOwHjFuIzivsCq7klqiYYjNruFtH53QEHRKWJhwrrW1AHGQQz3N3nZ/9bV/CvOfC4OZw5CQB4ewDEnYOoMwsQBhlflY2gNDqwcFlC42XIVe+ZD/vL0XNtK+2EK0wmihwEyhieZ8CmoOl/PLxdez9Ipc+Bu5yVDqkIAl4F58Ct55l+21aRVeQEoCxR/3+TJQicwHIurpCftL/g0WF16qnrJ1kcZwSyUi1UO0krBeczrkpjz2gG+Cf/NunLYCn5aXDJ+fJ8QOP8JrG9zQfLMsXiszZv4ICxI5iQDOCAz6r3cHtZCThJJy53FQc=
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQbrGHhGkoYLlQjUb+r909i28NXL24zbf7o8zWM/9B3 serebit@hawking
--- a/roles/archbuild/files/diffpkg
+++ b/roles/archbuild/files/diffpkg
-#!/bin/zsh -e
-
-parse() {
-  local pkgdata
-  IFS=- read -A pkgdata <<<"${${1:t}%.pkg.tar*}"
-  pkgname=${(j:-:)pkgdata[1,-4]}
-  epoch=
-  pkgver=${pkgdata[-3]}
-  pkgrel=${pkgdata[-2]}
-  arch=${pkgdata[-1]}
-
-  IFS=: read -A pkgdata <<<$pkgver
-  if (( ${#pkgdata} > 1 )); then
-    epoch=${pkgdata[1]}:
-    pkgver=${pkgdata[2]}
-  fi
-}
-
-header() {
-  local pkgname epoch pkgver pkgrel arch pad
-  parse $1
-  shift
-  pad=$((cols/2 - ${#:-"$pkgname $epoch$pkgver-$pkgrel $arch${1:+ }$*"}))
-  (( pad > 0 )) || pad=0
-  print -P "%B$pkgname %F{10}$epoch$pkgver-$pkgrel%f %F{12}$arch%f${1:+ }$*%b${(r:pad:)}"
-}
-
-headers() {
-  local cols=$((COLUMNS - 4))
-  print -P "$(header $1 ${*:3}) ${(l:cols%2:)}|${(l:1-cols%2:)} $(header $2 ${*:3})"
-}
-
-sdifftw() {
-  sdiff -tw $COLUMNS $( (( VERBOSE )) || echo -s) $* || :
-}
-
-tartf() {
-  bsdtar tf $* | if (( VERBOSE )); then
-    cat
-  else
-    sed -r 's|^usr/lib/modules/[0-9][^/]+|usr/lib/modules/[…]|'
-  fi | sort
-}
-
-diff_names() {
-  headers $1 $2 files
-  sdifftw <(tartf $1) <(tartf $2)
-}
-
-diff_files() {
-  headers $*
-  sdifftw <(bsdtar xOqf $1 ${*:3}) <(bsdtar xOqf $2 ${*:3})
-}
-
-if (( $# != 2 )); then
-  print -Pu2 "%F{9}%BError:%b Specify two packages%f"
-  exit 1
-fi
-
-diff_names $1 $2
-diff_files $1 $2 .PKGINFO
-if (( VERBOSE )); then
-    diff_files $1 $2 .BUILDINFO
-fi
-
-# vim:set sw=2 et:
--- a/roles/archbuild/files/diffrepo
+++ b/roles/archbuild/files/diffrepo
-#!/bin/zsh
-setopt extendedglob nomatch
-
-parse() {
-  local pkgdata
-  IFS=- read -A pkgdata <<<"${${1:t}%.pkg.tar*}"
-  pkgname=${(j:-:)pkgdata[1,-4]}
-  epoch=
-  pkgver=${pkgdata[-3]}
-  pkgrel=${pkgdata[-2]}
-  arch=${pkgdata[-1]}
-
-  IFS=: read -A pkgdata <<<$pkgver
-  if (( ${#pkgdata} > 1 )); then
-    epoch=${pkgdata[1]}:
-    pkgver=${pkgdata[2]}
-  fi
-}
-
-function {
-  local pkgname epoch pkgver pkgrel arch
-  for pkg in $(makepkg --packagelist); do
-    parse $pkg
-    if [[ -n $1 ]]; then
-        otherpkg=( /srv/ftp/pool/*/${pkgname}-${1}-${arch}.pkg.tar*~*.sig(Nom[1]) )
-    else
-        otherpkg=( /srv/ftp/pool/*/${pkgname}-[^-]##-[^-]##-${arch}.pkg.tar*~*.sig(Nom[1]) )
-    fi
-    if [[ -n $otherpkg ]]; then
-      ${${(%):-%x}:A:h}/diffpkg $otherpkg $pkg
-    else
-      print -P "%F{11}%BWarning:%b No repo package found for $pkg%f"
-    fi
-  done
-} $1
-
-# vim:set sw=2 et:
No results found