Compare revisions

9a66ebed · 59c5317e · 7d98f12a · 5211f9ac · d2c62407 · b04e1fb0
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -9,10 +9,12 @@ skip_list:
  # yaml: too many spaces inside braces (yaml[braces])
  - yaml[braces]
  # Do not recommend running tasks as handlers
-  - 'no-handler'
+  - no-handler
  # Do not force galaxy info in meta/main.yml
-  - 'meta-no-info'
+  - meta-no-info
  # Allow package versions to be specified as 'latest'
-  - 'package-latest'
-  # Don't require FQCN for builtin actions
-  - 'fqcn-builtins'
+  - package-latest
+  # Don't require fully-qualified collection names
+  - fqcn
+  # Allow free-form module calling syntax
+  - no-free-form
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ image: "archlinux:latest"

 ansible-lint:
  before_script:
-    - pacman -Syu --needed --noconfirm ansible-lint ansible
+    - pacman -Syu --needed --noconfirm ansible-lint ansible python-jmespath
  script:
    # Fix weird ansible bug: https://github.com/trailofbits/algo/issues/1637
    # This probably happens due to gitlab-runner mounting the git repo into the container

--- a/.gitlab/issue_templates/Offboarding.md
+++ b/.gitlab/issue_templates/Offboarding.md
@@ -13,37 +13,41 @@ This template should be used for offboarding Arch Linux team members.

 ## All roles checklist

- [ ] Remove user email by reverting instructions from `docs/email.md`.
-  - [ ] Setup forwarding if desired (please add the current date as a comment above the mail address in Postfix's `users` file).
-  - [ ] Inform the user of the conditions for forwarding.
-    - In most cases we only offer forwarding for 6 months.
-    - We will inform the user prior to disabling the forwarding.
-    - The forwarding can be extended if there are good reasons for doing so.
+- [ ] Remove user email by reverting instructions from [`docs/email.md`](docs/email.md).
+  - [ ] Remove entry in [`group_vars/all/archusers.yml`](group_vars/all/archusers.yml).
+  - [ ] Remove SSH pubkey from `pubkeys/<username>.pub`.
+  - [ ] Run `ansible-playbook -t archusers  $(git grep -l archusers playbooks/ | grep -v phrik)`.
+  - [ ] Setup forwarding if requested (please add the current date as a comment above the mail address in Postfix's `users` file).
+    - [ ] Inform the user of the conditions for forwarding.
+      - In most cases we only offer forwarding for 6 months.
+      - We will inform the user prior to disabling the forwarding.
+      - The forwarding can be extended if there are good reasons for doing so.
 - [ ] Set user to inactive in archweb: https://www.archlinux.org/admin/auth/user/
- [ ] Remove member from [staff mailing list](https://lists.archlinux.org/admin/staff/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 member from [staff mailing list](https://lists.archlinux.org/mailman3/lists/staff.lists.archlinux.org/members/member/).
+- [ ] Moderate email address on [arch-dev-public](https://lists.archlinux.org/mailman3/lists/arch-dev-public.lists.archlinux.org/members/member/) (find member and moderate).
+- [ ] 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.
+
+## Main key offboarding checklist
+
+- [ ] Remove user email for the `master-key.archlinux.org` subdomain by reverting instructions from [`docs/email.md`](docs/email.md).
+- [ ] Create an issue in [archlinux-keyring](https://gitlab.archlinux.org/archlinux/archlinux-keyring) using the [*"Remove Main Key"*](https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/issues/new?issuable_template=Remove%20Main%20Key) template.

 ## TU/Developer offboarding checklist

- [ ] Remove entry in `group_vars/all/archusers.yml`.
- [ ] Remove SSH pubkey from `pubkeys/<username>.pub`.
- [ ] Run `ansible-playbook -t archusers  $(git grep -l archusers playbooks/ | grep -v phrik)`.
- [ ] Remove the user from the `Trusted Users`/`Developers` groups on Keycloak.
- [ ] Moderate email address on [arch-dev-public](https://lists.archlinux.org/admin/arch-dev-public/members) (find member and moderate)
- [ ] Remove member from [arch-tu](https://lists.archlinux.org/admin/arch-tu/members) and/or [arch-dev](https://lists.archlinux.org/admin/arch-dev/members) mailing lists
- [ ] Create [issue in archlinux-keyring](https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/issues/new) (choose *"Remove Packager Key"* and/or *"Remove Main Key"* template)
+- [ ] Remove member from [arch-tu](https://lists.archlinux.org/mailman3/lists/arch-tu.lists.archlinux.org/members/member/) and/or [arch-dev](https://lists.archlinux.org/mailman3/lists/arch-dev.lists.archlinux.org/members/member/) mailing lists.
+- [ ] Ask the user to leave `#archlinux-tu` and/or `#archlinux-dev` on Libera Chat and forget the password(s).
+- [ ] Create an issue in [archlinux-keyring](https://gitlab.archlinux.org/archlinux/archlinux-keyring) using the [*"Remove Packager Key"*](https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/issues/new?issuable_template=Remove%20Packager%20Key) template.

 ## DevOps offboarding checklist

- [ ] Remove entries in `group_vars/all/root_access.yml`.
+- [ ] Remove entries in [`group_vars/all/root_access.yml`](group_vars/all/root_access.yml).
 - [ ] Run `ansible-playbook -t root_ssh playbooks/all-hosts-basic.yml`.
 - [ ] Run `ansible-playbook playbooks/hetzner_storagebox.yml playbooks/rsync.net.yml`.
- [ ] Remove the user from the `DevOps` group on Keycloak.
- [ ] Remove member from [arch-devops-private mailing lists](https://lists.archlinux.org/admin/arch-devops-private/members)
- [ ] Remove pubkey from [Hetzner's key management](https://robot.your-server.de/key/index)
+- [ ] Remove member from [arch-devops-private mailing lists](https://lists.archlinux.org/mailman3/lists/arch-devops-private.lists.archlinux.org/members/member/).
+- [ ] Remove pubkey from [Hetzner's key management](https://robot.your-server.de/key/index).

 ## Wiki Administrator checklist

- [ ] Remove the user from the `Wiki Admins` group on Keycloak.
- [ ] Remove member from [arch-wiki-admins mailing list](https://lists.archlinux.org/admin/arch-wiki-admins/members).
+- [ ] Remove member from [arch-wiki-admins mailing list](https://lists.archlinux.org/mailman3/lists/arch-wiki-admins.lists.archlinux.org/members/member/).
--- a/.gitlab/issue_templates/Onboarding.md
+++ b/.gitlab/issue_templates/Onboarding.md
@@ -30,11 +30,17 @@ https://www.gnupg.org/gph/en/manual/x135.html
 -->

 ## All roles checklist
-The mailing list password can be found in [`misc/vaults/additional-credentials.vault`](misc/vaults/additional-credentials.vault).

- [ ] Add new user email as per [`docs/email.md`](docs/email.md).
+- [ ] Add user mail if TU or developer, or support staff and **communication e-mail address** is arch.
+  - [ ] Add new user email as per [`docs/email.md`](docs/email.md).
+  - [ ] Add entry in [`group_vars/all/archusers.yml`](group_vars/all/archusers.yml).
+    - If support staff `hosts` should be set to `mail.archlinux.org`.
+    - `homedir.archlinux.org` is also allowed for support staff, but it is opt-in.
+  - [ ] Add SSH pubkey to `pubkeys/<username>.pub`.
+  - [ ] Run `ansible-playbook -t archusers $(git grep -l archusers playbooks/ | grep -v phrik)`.
 - [ ] Create a new user in [archweb](https://www.archlinux.org/devel/newuser/). Select the appropriate group membership and allowed repos (if applicable).
- [ ] Subscribe **communication e-mail address** to internal [staff mailing list](https://lists.archlinux.org/admin/staff/members/add).
+- [ ] Subscribe **communication e-mail address** to internal [staff mailing list](https://lists.archlinux.org/mailman3/lists/staff.lists.archlinux.org/mass_subscribe/).
+- [ ] Allow sending from **communication e-mail address** on [arch-dev-public](https://lists.archlinux.org/mailman3/lists/arch-dev-public.lists.archlinux.org/members/member/) (subscribe and/or find address and remove moderation).
 - [ ] Give the user access to `#archlinux-staff` on Libera Chat.
 - [ ] Give the user a link to our [staff services page](https://wiki.archlinux.org/title/DeveloperWiki:Staff_Services).
 - [ ] Replace the **Team member username** with the @-prefixed username on Gitlab.
@@ -42,50 +48,34 @@ The mailing list password can be found in [`misc/vaults/additional-credentials.v
  address**, as well as the clearsigned representation of this data), remove
  the description history and make the issue non-confidential.
 - [ ] Request staff cloak on Libera Chat ([Group contacts](https://wiki.archlinux.org/title/Arch_IRC_channels#Libera_Chat_group_contacts))
- [ ] Go to [Arch Linux group](https://gitlab.archlinux.org/groups/archlinux/-/group_members) -> Enter Admin mode -> go to members -> add username as "minimal access"
- [ ] Go to [Arch Staff group](https://gitlab.archlinux.org/groups/archlinux/teams/staff/-/group_members) -> Enter Admin mode -> go to members -> add username as "reporter"
-
-## Packager onboarding checklist
-
-<!-- The ticket should be created by a sponsor of the new packager -->
- [ ] Create [issue in archlinux-keyring using the *"New Packager Key"* template](https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/issues/new?issuable_template=New%20Packager%20Key).

 ## Main key onboarding checklist

 - [ ] Add new user email for the `master-key.archlinux.org` subdomain as per [`docs/email.md`](docs/email.md).
-<!-- The ticket should be created by the developer becoming a new main key holder -->
- [ ] Create [issue in archlinux-keyring using the *"New Main Key"* template](https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/issues/new?issuable_template=New%20Main%20Key).
+  <!-- The ticket should be created by the developer becoming a new main key holder -->
+- [ ] Create an issue in [archlinux-keyring](https://gitlab.archlinux.org/archlinux/archlinux-keyring) using the [*"New Main Key"*](https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/issues/new?issuable_template=New%20Main%20Key) template.

-## Developer onboarding checklist
+## TU/Developer onboarding checklist

- [ ] Add entry in [`group_vars/all/archusers.yml`](group_vars/all/archusers.yml).
- [ ] Add SSH pubkey to `pubkeys/<username>.pub`.
- [ ] Run `ansible-playbook -t archusers  $(git grep -l archusers playbooks/ | grep -v phrik)`.
- [ ] Assign the user to the `Developers` groups on Keycloak.
- [ ] Assign the user to the `Developers` group on [archlinux.org](https://archlinux.org/admin/auth/user/).
- [ ] Subscribe **communication e-mail address** to internal [arch-dev](https://lists.archlinux.org/admin/arch-dev/members/add) mailing list.
- [ ] Allow sending from **communication e-mail address** on [arch-dev-public](https://lists.archlinux.org/admin/arch-dev-public/members) (subscribe and/or find address and remove moderation).
+<!-- The ticket should be created by a sponsor of the new packager -->
+- [ ] Create an issue in [archlinux-keyring](https://gitlab.archlinux.org/archlinux/archlinux-keyring) using the [*"New Packager Key"*](https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/issues/new?issuable_template=New%20Packager%20Key) template.
+- [ ] Assign the user to the `Trusted Users` or `Developers` group on Keycloak.
+- [ ] Assign the user to the `Trusted Users` or `Developers` group on [archlinux.org](https://archlinux.org/admin/auth/user/).
+- [ ] Subscribe **communication e-mail address** to internal [arch-tu](https://lists.archlinux.org/mailman3/lists/arch-tu.lists.archlinux.org/mass_subscribe/) or [arch-dev](https://lists.archlinux.org/mailman3/lists/arch-dev.lists.archlinux.org/mass_subscribe/) mailing list.
+- [ ] Give the user access to `#archlinux-tu` or `#archlinux-dev` on Libera Chat.

-## TU onboarding checklist
+## Support staff checklist

- [ ] Add entry in [`group_vars/all/archusers.yml`](group_vars/all/archusers.yml).
- [ ] Add SSH pubkey to `pubkeys/<username>.pub`.
- [ ] Run `ansible-playbook -t archusers  $(git grep -l archusers playbooks/ | grep -v phrik)`.
- [ ] Assign the user to the `Trusted Users` groups on Keycloak.
- [ ] Assign the user to the `Trusted Users` group on [archlinux.org](https://archlinux.org/admin/auth/user/).
- [ ] Subscribe **communication e-mail address** to internal [arch-tu](https://lists.archlinux.org/admin/arch-tu/members/add) mailing list.
- [ ] Allow sending from **communication e-mail address** on [arch-dev-public](https://lists.archlinux.org/admin/arch-dev-public/members) (subscribe and/or find address and remove moderation).
+- [ ] Assign the user to the proper support staff group on Keycloak.

 ## DevOps onboarding checklist

 - [ ] Add entries in [`group_vars/all/root_access.yml`](group_vars/all/root_access.yml).
 - [ ] Run `ansible-playbook -t root_ssh playbooks/all-hosts-basic.yml`.
 - [ ] Run `ansible-playbook playbooks/hetzner_storagebox.yml playbooks/rsync.net.yml`.
- [ ] Assign the user to the `DevOps` group on Keycloak.
- [ ] Subscribe **communication e-mail address** to internal [arch-devops-private](https://lists.archlinux.org/admin/arch-devops-private/members/add) mailing list.
+- [ ] Subscribe **communication e-mail address** to internal [arch-devops-private](https://lists.archlinux.org/mailman3/lists/arch-devops-private.lists.archlinux.org/mass_subscribe/) mailing list.
 - [ ] Add pubkey to [Hetzner's key management](https://robot.your-server.de/key/index) for Dedicated server rescue system.

 ## Wiki Administrator checklist

- [ ] Assign the user to the `Wiki Admins` group on Keycloak.
- [ ] Subscribe **communication e-mail address** to the [arch-wiki-admins](https://lists.archlinux.org/admin/arch-wiki-admins/members/add) mailing list.
+- [ ] Subscribe **communication e-mail address** to the [arch-wiki-admins](https://lists.archlinux.org/mailman3/lists/arch-wiki-admins.lists.archlinux.org/mass_subscribe/) mailing list.
--- a/docs/email.md
+++ b/docs/email.md
@@ -62,8 +62,8 @@ rspamadm dkim_keygen -s dkim-rsa -b 4096 -d archlinux.org -t rsa -k archlinux.or
 the ouput gives you the DNS entries to add to the terraform files.
 The keys generated need to go to the vault:
 ```
-roles/rspamd/files/archlinux.org.dkim-rsa.key
-roles/rspamd/files/archlinux.org.dkim-ed25519.key
+roles/rspamd/files/archlinux.org.dkim-rsa.key.vault
+roles/rspamd/files/archlinux.org.dkim-ed25519.key.vault
 ```

 # Gitlab servicedesk

--- a/docs/maintenance.md
+++ b/docs/maintenance.md
@@ -39,7 +39,7 @@ as a variable, to make sure the right file is used.
 - name: set up nginx
  template: src=nginx.d.conf.j2 dest="{{ service_nginx_conf }}" owner=root group=root mode=644
  notify:
-    - reload nginx
+    - Reload nginx
  when: maintenance is not defined
  tags: ['nginx']
 ```

--- a/docs/servers.md
+++ b/docs/servers.md
@@ -93,14 +93,14 @@ So to set up this server from scratch, run:
 ### Services
  - Runs a master [rebuilderd](https://reproducible.archlinux.org) instance
    with two workers:
-    - repro1.pkgbuild.com (Equinix Metal box with a Xeon E-2278G and 32G RAM)
    - repro2.pkgbuild.com (Kape server with an EPYC 7702P and 256G RAM)
+    - repro3.pkgbuild.com (Equinix Metal box with a Xeon E-2278G and 64G RAM)

 ## runner1.archlinux.org

 Medium-fast-ish Kape Arch Linux box.

-## runner2.archlinux.org
+## runner3.archlinux.org

 Medium-fast-ish Equinix Metal Arch Linux box.

@@ -131,11 +131,6 @@ Prometheus, and Grafana server which receives selected performance/metrics from
  - [Grafana](https://dashboards.archlinux.org) and [docs/grafana.md](./docs/grafana.md)
  - Prometheus

-## patchwork.archlinux.org
-
-### Services
-  - patchwork
-
 ## redirect.archlinux.org

 ### Services
@@ -157,14 +152,6 @@ Prometheus, and Grafana server which receives selected performance/metrics from

  Online collborative markdwown editor for Arch Linux Staff.

-## mailman3.archlinux.org
-
-This server runs mailman3 as mailman2 and mailman3 can't be installed on the same server. The HTTP and LMTP traffic is routed over WireGuard from lists.archlinux.org.
-
-### Services
-
-  - mailman3
-
 ### Services
  - [hedgedoc](https://hedgedoc.org/)


--- a/docs/ssh-hostkeys.txt
+++ b/docs/ssh-hostkeys.txt
@@ -164,15 +164,15 @@
 3072 MD5:50:c8:93:43:05:d5:73:a4:84:b1:07:66:a7:20:a5:79 root@archlinux-packer (RSA)

 # lists.archlinux.org
-1024 SHA256:/o3BhNZ6MdfHXrqDzVxP5OgKcTmo1/e2v80Xb+Q2ypc root@archlinux-packer (DSA)
-256 SHA256:Xe+YrG+IfhtQkNft+SB7UsTQCIgbqNnqMl/Pqs6uzBE root@archlinux-packer (ECDSA)
-256 SHA256:fAKD+26rDZ74MOMWZI8L3k2c7RzTYd69+iwKp4zhw8c root@archlinux-packer (ED25519)
-3072 SHA256:NyspEiVRnuRtL854ErcdybtjoBia+miQkpuToYZEl78 root@archlinux-packer (RSA)
+1024 SHA256:U1A+NO+I+JRg0YPo+UgwGfbextnL+pVuqjWGdyokLpI root@archlinux-packer (DSA)
+256 SHA256:vdEZ5/6Xxd7Azjzaf5xz5kfzQrWcq1raz5cFAIclooE root@archlinux-packer (ECDSA)
+256 SHA256:iCeRz+2HK7heoapDRscHpgbEX4cbem1BZpWzrAoOxTQ root@archlinux-packer (ED25519)
+3072 SHA256:sqUYYmrNXzYPL5TtsBsTnaANsZ/P7miyCAIkt0YWfBg root@archlinux-packer (RSA)

-1024 MD5:fb:bb:0e:a8:0c:5c:41:5a:b1:d9:61:4d:e5:c3:bf:b1 root@archlinux-packer (DSA)
-256 MD5:56:43:80:27:a7:4e:4c:1f:a4:14:dd:d1:eb:37:13:a9 root@archlinux-packer (ECDSA)
-256 MD5:3c:91:d8:b0:4b:5c:36:40:79:27:8a:c7:24:d6:26:af root@archlinux-packer (ED25519)
-3072 MD5:88:99:f2:47:b1:e3:3c:99:52:67:d5:d5:55:b0:af:2c root@archlinux-packer (RSA)
+1024 MD5:8f:94:fe:a9:56:ee:3f:cc:a4:e7:a5:4f:2b:02:e8:c3 root@archlinux-packer (DSA)
+256 MD5:ca:3e:2d:aa:8a:4b:71:3a:18:22:59:0f:6e:ff:ae:5d root@archlinux-packer (ECDSA)
+256 MD5:a8:d3:f8:42:ff:ae:7d:71:1b:fe:93:4b:f7:df:38:5f root@archlinux-packer (ED25519)
+3072 MD5:51:ea:a4:ec:76:87:ee:89:e7:3a:fc:80:ea:fe:2d:9c root@archlinux-packer (RSA)

 # mail.archlinux.org
 1024 SHA256:/d3MC4NoQbPSNgNebFyzNCze4HVHPhITVWy9vWdZUp4 root@archlinux-packer (DSA)
@@ -185,17 +185,6 @@
 256 MD5:dd:20:c1:f1:f2:fa:70:86:3a:e2:39:86:b1:01:2f:61 root@archlinux-packer (ED25519)
 3072 MD5:b6:14:30:bd:fe:43:46:6a:20:a2:8b:b0:aa:d4:35:19 root@archlinux-packer (RSA)

-# mailman3.archlinux.org
-1024 SHA256:U1A+NO+I+JRg0YPo+UgwGfbextnL+pVuqjWGdyokLpI root@archlinux-packer (DSA)
-256 SHA256:vdEZ5/6Xxd7Azjzaf5xz5kfzQrWcq1raz5cFAIclooE root@archlinux-packer (ECDSA)
-256 SHA256:iCeRz+2HK7heoapDRscHpgbEX4cbem1BZpWzrAoOxTQ root@archlinux-packer (ED25519)
-3072 SHA256:sqUYYmrNXzYPL5TtsBsTnaANsZ/P7miyCAIkt0YWfBg root@archlinux-packer (RSA)
-
-1024 MD5:8f:94:fe:a9:56:ee:3f:cc:a4:e7:a5:4f:2b:02:e8:c3 root@archlinux-packer (DSA)
-256 MD5:ca:3e:2d:aa:8a:4b:71:3a:18:22:59:0f:6e:ff:ae:5d root@archlinux-packer (ECDSA)
-256 MD5:a8:d3:f8:42:ff:ae:7d:71:1b:fe:93:4b:f7:df:38:5f root@archlinux-packer (ED25519)
-3072 MD5:51:ea:a4:ec:76:87:ee:89:e7:3a:fc:80:ea:fe:2d:9c root@archlinux-packer (RSA)
-
 # man.archlinux.org
 1024 SHA256:11C7Qa1GSNBBspSlber3Sp+LEMRpfr/VWkypfu6OnhA root@archlinux-packer (DSA)
 256 SHA256:fL79NVaEiwXGfUhTXWLkue/D1seSADYbui+jwQ2dvW0 root@archlinux-packer (ECDSA)
@@ -251,17 +240,6 @@
 256 MD5:fe:a1:ab:4d:f6:5d:76:f9:a3:99:be:fd:51:ee:77:ed root@archlinux-packer (ED25519)
 3072 MD5:ad:ee:a6:6d:b7:9b:f0:f7:78:9f:df:b4:53:2e:5f:9f root@archlinux-packer (RSA)

-# patchwork.archlinux.org
-1024 SHA256:FRn2yrB4ABYzLFs9muVWw/4PRq3ahNoV0EnweAip87g root@archlinux-packer (DSA)
-256 SHA256:Zmox+d8LXNaUo4d8ywmPXTHyjV7mCCAFYycEZd73c6w root@archlinux-packer (ECDSA)
-256 SHA256:xdY/tDi/x0z2SDTxzCrrt+Oygn5IYI0kMyN9JlPesw4 root@archlinux-packer (ED25519)
-3072 SHA256:erHz5RJTWqaKPUCB/bZMBxQfXQIi23rrrOOTPH+KUtc root@archlinux-packer (RSA)
-
-1024 MD5:44:f4:b3:50:0e:ef:bb:ee:b6:85:06:b6:fb:bd:02:6f root@archlinux-packer (DSA)
-256 MD5:6c:f2:1b:97:21:77:f2:b2:03:e7:9a:8f:aa:0d:c6:6c root@archlinux-packer (ECDSA)
-256 MD5:6b:03:f5:0e:0f:4c:50:34:7a:19:f8:28:48:5b:93:09 root@archlinux-packer (ED25519)
-3072 MD5:0a:03:c6:ef:a1:9d:24:a7:59:ce:bb:41:87:6a:e0:af root@archlinux-packer (RSA)
-
 # phrik.archlinux.org
 1024 SHA256:+482UWH5/pSMZ8VoIgkGZxGOm1tZ72rI5RrZsnQHDVk root@archlinux-packer (DSA)
 256 SHA256:qL+sG+DBwRKII1uPVcFHKQUfQNd7sW0x6iop6/Ki1Og root@archlinux-packer (ECDSA)
@@ -295,17 +273,6 @@
 256 MD5:5a:49:d5:f3:00:ca:49:17:d8:cc:3e:84:1d:60:be:06 root@archlinux-packer (ED25519)
 3072 MD5:1e:52:48:56:d3:13:20:e5:02:4f:10:1b:af:27:e5:c7 root@archlinux-packer (RSA)

-# repro1.pkgbuild.com
-1024 SHA256:K2RjAgIzlRrSkqdf3vqwfXOOg0oEMt/AwAT2Gmt2wpA root@repro3.pkgbuild.com (DSA)
-256 SHA256:H/7en8S/UqQ+llIDPyCIn9sYHjiEU6L+Myu0MpmoDsE root@repro3.pkgbuild.com (ECDSA)
-256 SHA256:NaiYaen6WM78LFaRn4MUnb450sWjiac0rZjy84CTd+U root@repro3.pkgbuild.com (ED25519)
-3072 SHA256:lsXZROhzM0y5kxQ6cBnbm7IGFN+Um3cjqhZGJt36cHM root@repro3.pkgbuild.com (RSA)
-
-1024 MD5:a4:45:6e:b1:92:5d:c0:c4:1e:22:3f:13:ef:3a:24:16 root@repro3.pkgbuild.com (DSA)
-256 MD5:23:e1:f9:16:1f:17:f2:c5:7e:7a:28:36:33:3c:79:d5 root@repro3.pkgbuild.com (ECDSA)
-256 MD5:15:31:37:f4:f2:e5:93:e7:28:8f:e2:db:6e:6d:24:e2 root@repro3.pkgbuild.com (ED25519)
-3072 MD5:d7:f7:8e:0b:bf:8f:58:83:33:ba:c8:22:4b:3c:50:96 root@repro3.pkgbuild.com (RSA)
-
 # repro2.pkgbuild.com
 1024 SHA256:sppthtBQD60z8f0bDUnoMUesg55M7/ez4qGXVUUDtRQ root@repro2.pkgbuild.com (DSA)
 256 SHA256:enqq08K6vQV8CcISu1upR3Ooa63HD6Z+PtRzMVArnTk root@repro2.pkgbuild.com (ECDSA)
@@ -317,6 +284,15 @@
 256 MD5:21:76:73:3b:ac:30:6d:f5:a5:f6:52:2e:13:dc:b4:cb root@repro2.pkgbuild.com (ED25519)
 3072 MD5:12:70:8a:d4:ef:a9:43:6e:6b:53:46:71:f7:96:ec:fb root@repro2.pkgbuild.com (RSA)

+# repro3.pkgbuild.com
+256 SHA256:nHvXWHzyUiPSDnziFovrOANbIUPcpdDRZ7Zptk8Es+c root@repro3.pkgbuild.com (ECDSA)
+256 SHA256:5bu/HRIvyyHrLAFdCh3ydy7uwgc+yliEykHxhA92Ftw root@repro3.pkgbuild.com (ED25519)
+3072 SHA256:fMQPcjKR5EyO0+YYOSd5p7jIcLAy+LdeTMYuR/Pr3qo root@repro3.pkgbuild.com (RSA)
+
+256 MD5:be:f1:3e:28:32:2e:38:8a:f6:c5:0c:16:e3:5c:db:f7 root@repro3.pkgbuild.com (ECDSA)
+256 MD5:cf:cd:f8:9b:1e:ae:15:0b:ea:a3:a7:73:c2:b8:10:21 root@repro3.pkgbuild.com (ED25519)
+3072 MD5:9f:4e:4b:02:54:07:8c:ae:66:de:72:cd:15:51:00:64 root@repro3.pkgbuild.com (RSA)
+
 # reproducible.archlinux.org
 1024 SHA256:3HoA8rGGureKWKaIZst+Dc6f7yrf3Wfn5PO1HFMl35E root@archlinux-packer (DSA)
 256 SHA256:Yp3GHPq6GZZWUBv13XPiXciAbDFPH4XnEVHzR3/whUw root@archlinux-packer (ECDSA)
@@ -339,16 +315,14 @@
 256 MD5:fe:fc:6f:0f:0f:5e:76:25:ed:ac:6d:f1:5d:22:94:13 root@runner3.archlinux.org (ED25519)
 3072 MD5:92:43:38:30:47:11:2a:a3:df:2d:df:93:ce:3f:cc:d8 root@runner3.archlinux.org (RSA)

-# runner2.archlinux.org
-1024 SHA256:tK3XeUrt/ahlj1fdl5tQgeVXticllUIaewK2y86Jvzc root@runner2.archlinux.org (DSA)
-256 SHA256:iJGAgTQWSQk97dlNpkBMEW3peysCDnNFFZO5TyEguvs root@runner2.archlinux.org (ECDSA)
-256 SHA256:x9wziZt9b8qP7jgGPwlXAHI3aGC72xeoBg3pabGFhC0 root@runner2.archlinux.org (ED25519)
-3072 SHA256:D5gonGPebFRludfXdD1QNkb9CFE1/7hWWIKgq26b8pw root@runner2.archlinux.org (RSA)
+# runner3.archlinux.org
+256 SHA256:tJd9an8rlb+OAjj8FN8uOx37F5WOkge2MYlYwVOzH4M root@runner3.archlinux.org (ECDSA)
+256 SHA256:0VriXejd3wkb37ENKuFpgaWgw4qMhKjU50ttNpkYZs4 root@runner3.archlinux.org (ED25519)
+3072 SHA256:iv4/fPkDuQj9dgd81h8Tu/wH86YC7JjBecDSv3RHUP0 root@runner3.archlinux.org (RSA)

-1024 MD5:20:b1:f6:81:e8:ff:3e:f4:01:ab:b5:6d:42:87:7a:2d root@runner2.archlinux.org (DSA)
-256 MD5:60:3c:e7:96:b4:38:0a:96:b5:82:3f:ba:5d:3b:8d:17 root@runner2.archlinux.org (ECDSA)
-256 MD5:84:2a:9a:5b:41:d9:a6:d5:94:5b:29:16:dc:12:46:3c root@runner2.archlinux.org (ED25519)
-3072 MD5:01:5f:4b:37:f7:da:4c:56:8d:d8:c1:6c:a9:0e:33:fb root@runner2.archlinux.org (RSA)
+256 MD5:e7:ad:97:e0:27:78:41:3d:90:9a:60:42:b6:8f:e1:ab root@runner3.archlinux.org (ECDSA)
+256 MD5:90:26:14:89:6c:a7:5f:7f:ff:7f:70:60:ea:96:90:ee root@runner3.archlinux.org (ED25519)
+3072 MD5:e1:25:f6:c5:0e:f2:6c:43:e8:49:78:cb:18:22:30:3e root@runner3.archlinux.org (RSA)

 # secure-runner1.archlinux.org
 1024 SHA256:9R7X3mEZFVnTChSgjX2TKu50/+oyeQSiR2dkdBgl6+4 root@secure-runner1.archlinux.org (DSA)
@@ -372,6 +346,17 @@
 256 MD5:9e:30:b4:b8:91:f0:e2:4c:ff:c5:54:9a:73:b0:17:76 root@archlinux-packer (ED25519)
 3072 MD5:bf:05:ec:33:54:26:58:51:a8:20:a5:c2:35:55:f8:bd root@archlinux-packer (RSA)

+# seoul.mirror.pkgbuild.com
+1024 SHA256:bOvfq1J9XaPOYpAxPo6qng6YqVWxh0JKrMmJgYASvd8 root@seoul.mirror.pkgbuild.com (DSA)
+256 SHA256:cqDfTJUWV4AYwlZvjD1OPhtVljLRq28G+pQ0Kxl5ea0 root@seoul.mirror.pkgbuild.com (ECDSA)
+256 SHA256:PPGHFD1wBW2wR/W8dZqqdxX0fB9V5aYsCCAWGAn03aE root@seoul.mirror.pkgbuild.com (ED25519)
+3072 SHA256:ZmHXCGucLCkY4o3r9S8iO1VJr0S8F+nvrPvGckSQS2A root@seoul.mirror.pkgbuild.com (RSA)
+
+1024 MD5:28:ed:e2:e1:d6:9e:d0:a9:e6:33:85:6f:40:df:34:a2 root@seoul.mirror.pkgbuild.com (DSA)
+256 MD5:a2:7f:57:45:1b:31:f2:92:5c:c5:63:8a:1b:ad:be:12 root@seoul.mirror.pkgbuild.com (ECDSA)
+256 MD5:73:75:b6:93:c7:c2:00:e8:69:de:68:90:fe:85:12:b6 root@seoul.mirror.pkgbuild.com (ED25519)
+3072 MD5:51:52:c1:ae:ff:91:11:8b:e7:47:4d:47:db:f0:69:59 root@seoul.mirror.pkgbuild.com (RSA)
+
 # state.archlinux.org
 1024 SHA256:4oNX8CksPEgIzibu+ETa2OVVPBX2pzcvcVUa60NbHiQ root@archlinux-packer (DSA)
 256 SHA256:uR7EDdVrvkZf43eNmumOeu2MeZn4oMB39ad9kHoobkk root@archlinux-packer (ECDSA)
@@ -383,6 +368,17 @@
 256 MD5:2b:7f:a8:75:ef:38:e3:c3:f7:2e:ea:9e:73:fd:3e:d5 root@archlinux-packer (ED25519)
 2048 MD5:f8:a9:75:e2:99:4f:ae:2b:70:72:a2:ae:9e:fb:f1:a2 root@archlinux-packer (RSA)

+# sydney.mirror.pkgbuild.com
+1024 SHA256:EoP+Sm3bXn1hUDg0W7WhFCc+KyH+84vdjBLVzo+Wpbw root@sydney.mirror.pkgbuild.com (DSA)
+256 SHA256:0C14BCI+/X8GqB08i/3UxpZChq5f3wEkefUy4Q46tEk root@sydney.mirror.pkgbuild.com (ECDSA)
+256 SHA256:t+3/dVmHhvmSvaAOi6ebI8S5TqoFHb83FQIoeGAzwAg root@sydney.mirror.pkgbuild.com (ED25519)
+3072 SHA256:R539MN4EivkbsJNEi9EfPnmRXes5klMaig/p/cWUQpg root@sydney.mirror.pkgbuild.com (RSA)
+
+1024 MD5:6d:a2:cb:0d:a8:65:b3:51:67:64:57:17:67:47:fc:91 root@sydney.mirror.pkgbuild.com (DSA)
+256 MD5:90:8d:6a:cb:0d:eb:eb:b6:46:67:79:ea:75:96:44:6c root@sydney.mirror.pkgbuild.com (ECDSA)
+256 MD5:70:c0:65:60:49:d3:7c:2e:9f:3f:71:04:6d:96:34:40 root@sydney.mirror.pkgbuild.com (ED25519)
+3072 MD5:a7:db:a0:e5:27:8e:77:65:08:0d:38:48:77:0e:4b:c1 root@sydney.mirror.pkgbuild.com (RSA)
+
 # wiki.archlinux.org
 1024 SHA256:MnCkxFpWB/mTDRHPVB4RLuSPMNfPQyotpFaWuc55DCk root@archlinux-packer (DSA)
 256 SHA256:26K98Dg4laIWFt++vxGPiANR6w+AvxgQUTb1TzeLilY root@archlinux-packer (ECDSA)

--- a/docs/ssh-known_hosts.txt
+++ b/docs/ssh-known_hosts.txt
@@ -86,20 +86,15 @@ homedir.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPxEHvFCXujU6s4eW0U79o
 homedir.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDuQbGoCSIPisaZeqtJhM369ugQWc8pHE8404AZu0yUgDxMl6AP5BUfdynlR6VGt4edSaEyp9BkT15YaKh5vph/9MUtZ2zbQ7WPRuvfLNG+RI458q4CYdykVMmTs1DEeAxaVMIAL3225pqh7QMcME0edX9f4PLLkQk8+AAAy24rvgwxLE0BnSLB3zp7wCJw5rm2iZAcqsKkIZw2FJKMlRuEovdvgc7A0FfkSc8muvvHET1FK/Uqv5i9R2Xk3NPFkt/bzcwOVBXCeqUrjLmD0UhRWX8J8GMmrEVPVQLBT6mn/OtlXpOiDcr9HkSLS1mqo59N9wyI4tCKjYQZMEWU36PYjXlDzqOGmdAR6Ly8vDo3BC+ByQqLf/ixkoFD/I5inGejPnAv9eXuiP8o0KoPDOALD8gqwqCoPjElE9ZVObp+NJbuQeXRZt70VKxZEWrUKxKxHM3RoYvgd3h/GHaYEGWdbvTMTVK+xnrczL+Eme4Y81zA8KTwY5qbyc5QCHvksKM=

 # lists.archlinux.org
-lists.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKBHMlX50Jr2HiVJ/qDSH3mAjobpbBrGvBRXTKB/xXFBiVXCbJQCQ9HKXQZunLALaIm+jAgpskbXqLQMEpWzST8=
-lists.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOVKwNsXUXpgNhlwPVlBRNlpvOt0U9deANS/n//nxbe1
-lists.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuKQnkGRdXyu74f92lzJcQMMDjTzVXkne/mLHiMYKQWlboIBIry3FkzyUGDLbNlZOe4PNR43D9FI0/1EjAuVV72HVQ9sidCbJR/azw3+JF8zwU1HDMOhtCNaWYNqk0DHDvHuWhL6N0duFASf+ZTKRB5Rgk3+p0FisKMCep2vJy5kHY0829INk6ORgPxYzCHCZOLEfZX0aydwscTnubKq1t9blWUdqKSm5Xq5+NEJNPKlo6TgdcBihkdAyaGnZ9KWrXycV6j0UaT/VJNuumZ9KlsvI7Xi/TVDWcLcsU/UqeEvnzUi3oRrvkADzIcoFa5/QrSRQJppKAUgjuhOuk+Px38IIvRdrwDxDoChei+qU8S2O24PP7Cu4oYZ/ecGb8wJleEWVVaYrD5JTEugg0iTe2t0LJiP6rTC1faxErZ9wru18nGNWYR2b+b1MfBzppAoikZUoqygKYYLAerHj3B9wFmw2RJG8JFZ95lMukJmDG8kCYz7eq753PYAAmpFZbdZU=
+lists.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLYxKdG6ntbOV/YpVbRkJiJfAPt8BTTN/hKm0uebSwpuQbbv5hxXLSOYeA0C/yJBNXXX4EJ82J88oEJQBFxiPvY=
+lists.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID+GtJoC+QEUyKA/ZneTBXOBs7W3JBAEb1nLDkjzsqa1
+lists.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDdPJQIkN6wDk/140HS1WCIKc0Iz7Oq8c98XaLB0i9ksUxkWB4rxia/WP5RRF+g9yAqZvIg0f5W0d85pfuh+1TOccXk8r6GsH+gRIEkdmwu4Mf7iBpkQxl3n70yjNGxgbwGkVG9vREvJ4v3l/NRZrX2/N3RvcPG9TQwjFFOFYTRZNfUPvsppk572yQ8cjf7oUvJmLOwsKagO5WMUoKFAbO35/Mp2H6VbApYtIdpkFOXnaJUVduHInNa18CmKl28ZSTsigLkYb8pboS6RacJYgA5kK0vQsXCguDrA+SI9k1xW4i9FjUWsLlPuLkk9c7Tj39R95gWhxWwQ99ApNDVvZa+skSbMS7h4/d3NosyM2OO9LfqPiHn2xDsuvmpN0ScCwuocwR09EMrj4MQKzo31ITFHuSyxob0Z4yTQrKvJxdNwveXqaRHFNXUvSWtoRkk2cKB5hjsr0QCROBidYu4WG+/LfolzJQfuRqH7dvg5dvmJLrcozfcCpxspdBTIEKLG/c=

 # mail.archlinux.org
 mail.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFvJy2P8zOSKt3EocULHN85PVGW1AINk15+GilqUc5a79Zsy0FvWqV16fjxLRN3zIOkBvSKZMvsNadja+quEr9s=
 mail.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICTOoGxsf23f6AjIHcQQuvbTOaeIt48Y0PiBj9qlJi1H
 mail.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDPrURadxte8UJiteGa6+Q+OjTAjhvGAQFkNSXj1pr4k03uxkU6l2v2LuTygk+4SZSCyUsKvNx/ljJeHBnuecQ8rRv19ZFqy/GQKB3oEmiNYMo2dYYlJWwTVBHatmghhB1j2y40yqdKWH2xQuXC3HtnS7fHG0g1Rc4R9KB4MQlcXkwnSEMpwpWBoO7sr0M4YTdwE+nSG9aNfyPbPGp3mX4ATz5X5hPJOlSFVDV6NuKrA+5qyt4jSKdeG5IuWeEnEJesYJEvShYdY9DvMCXnZykB0emzzk+5+Cp2lTPf9LOO3wNsTgHV/CwkoAoMgr9+ASefhBr3nxmmrs9T7nwuobGCGFUqQ2D8IKCmsWGVKXYERViz3x/gYUIlHgVJpoIXCFFqbdpWwxKR1aDMug2fFe699/FzuPdqrWPFdQMF2mPQ0w3AH/62KGp+PULE2HxrlCiY/gF2m8iJLgunxVKmi/c0ufgK9QilnKcPO+W4tcISa5MYt7MSTTLV9eVsgVjGhOU=

-# mailman3.archlinux.org
-mailman3.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLYxKdG6ntbOV/YpVbRkJiJfAPt8BTTN/hKm0uebSwpuQbbv5hxXLSOYeA0C/yJBNXXX4EJ82J88oEJQBFxiPvY=
-mailman3.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID+GtJoC+QEUyKA/ZneTBXOBs7W3JBAEb1nLDkjzsqa1
-mailman3.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDdPJQIkN6wDk/140HS1WCIKc0Iz7Oq8c98XaLB0i9ksUxkWB4rxia/WP5RRF+g9yAqZvIg0f5W0d85pfuh+1TOccXk8r6GsH+gRIEkdmwu4Mf7iBpkQxl3n70yjNGxgbwGkVG9vREvJ4v3l/NRZrX2/N3RvcPG9TQwjFFOFYTRZNfUPvsppk572yQ8cjf7oUvJmLOwsKagO5WMUoKFAbO35/Mp2H6VbApYtIdpkFOXnaJUVduHInNa18CmKl28ZSTsigLkYb8pboS6RacJYgA5kK0vQsXCguDrA+SI9k1xW4i9FjUWsLlPuLkk9c7Tj39R95gWhxWwQ99ApNDVvZa+skSbMS7h4/d3NosyM2OO9LfqPiHn2xDsuvmpN0ScCwuocwR09EMrj4MQKzo31ITFHuSyxob0Z4yTQrKvJxdNwveXqaRHFNXUvSWtoRkk2cKB5hjsr0QCROBidYu4WG+/LfolzJQfuRqH7dvg5dvmJLrcozfcCpxspdBTIEKLG/c=
-
 # man.archlinux.org
 man.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPhnsStoFw6rbVpE1S1vsXNk8de1SyMag1C+v0DWVSuNYzTylYg4322WbYzw45z2XhxrF6XmCSDMvgxvFwnfLQA=
 man.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHzjkN+igIxSIv5N9+ANNoo6knPa51Tj5TAXs4EQ8lY2
@@ -125,11 +120,6 @@ monitoring.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAA
 monitoring.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJCU4tNW4WHTQ43+HBbho/sbsU3BCzildSOziaJrVNvE
 monitoring.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDVAMU3iku88nPDAKjB++je4RRRkotwNdJEhRcO45Ujslhbq67D6BwcnaliR0ekZuhkQFs13dTNVGeb1VqN3I/wHVaECsd/Gz7Q2M5Ki2CqdUR8ztGaW/eWpY9r8Yk+h/fWdnZdnJPYhk7uZftJI9buqyqpkthvjQy9fZ2wyOb/BAk+7BYUdclcvCEMlW9HQljpgmj7snjTpMYMN0t3U7X3xydcOO6PwNIoSikufuMmbtCqtsUx/Xl1mVU2Xi584L8arjoKn9a4OjMUDorqAlFLeco6bWn5XEdfim6e+W55ZKg333j4KGMBFVW5Dk5mZGKfykalq4WONMe3nu0m4EqYFA/rGG/smliqjxCbWu9N6eDw1gKYOeq5gzx7ppQ9zL3BjL3gl+AbeUckxNCQ+zM66amZC6GmciiMq+hnpqeTUhocaGeriGVda4vO+IlCp4Wwx1zqcCZaHyzt/eIWT9DuXDqHq4gAshluGUR0gFTJ/0qhrYxQA/dW681LE3r9YLE=

-# patchwork.archlinux.org
-patchwork.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOpXUEDbpDxSTdEAZ9At+cpAxEiJBmAf/CbXkQ/868QjYmOg1nKrkBfEWStxH+TQJf7jb3W7wc8WRh1yb26IqfU=
-patchwork.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB/UP7+uXVjWrH21grHC62KETnkCt5+HPrfhgGwYkFFy
-patchwork.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC+Ykvy67N1lQbk5aKlDhN62+ymDr1MbBBwu+e5rXuxUcuKrNcK1reOqdMgGoxXE5ip6DvFTu1oxKDaHEeVH7tEdiDaC+cHljQEDjNd0qzdoyfxiL9PN9YcOgtUsBpKzOzORTc9n8grfG/bVeI2QLAorGk9sKVNsFDgawKTv5MVnhw4hE6Nbx+qZhtb5u9nJclhNv+MKI/y/3SrKibOU3yONlEDuiq5/zK8UkgTAnQ+F1TgjscqTwinFh0jEVAAqivNaWSIwBrjZDf9p433lOprotDAr0jZm/F+mPybZJhe1OXNutM5cnEZ2vEvJE52X2p60Hpo4vGtOrfLvSpub6aXaX9hAs2Pf+OPbHU6AET/nOz6GlzvUOs9H8fPyXn+JUjm1YXiqSZZHiA7V9qoNNcP2zaOPXW8tJEVV71r2pfA/fJ/L18bg8OgUIn4iRjODl8q29ZmRh4h4Azm41fwksQZq2rxBuE4likUikg6AkJtd/qWHAMwLRTQrTtho2GxN50=
-
 # phrik.archlinux.org
 phrik.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHHPJ79o6go5pRmE5eoeHe6kS9gM7Nsx///MA/tpmyqY/8ktgYu6MTnvSYKdgF1O4oSTfsU5mc7grpq7Qsl8+tA=
 phrik.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO45OY6f+b4KyFq13PyxjN/EcU11cgVZ1CrQZN2hGP0h
@@ -145,16 +135,16 @@ redirect.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIb
 redirect.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID8cqRGOzfp+waFo4fxxq2oUKPFsTNRL0MB1M3xT2Y5L
 redirect.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC3VdhG7Lm+UYBGjf/G8eUSXL43N2QLRTm23LaSKaegx9/41mtlRJAoHfpHsJg8a2nBEGebooZqp5rwP4kxj0pB7394VP5UjThhqBQ9lWKJgCkceRsvkRYkbrBQHyNiRcFQ7/3YxPFJyNlxQwxiBe9sRk1HHUtQOeleGAQoB+GOMkKSPmqD6k/D5GzoX/maqraFK8S0egapKF5VMWw+6apAv+vp7O/zyPrOddaKLB2XK2c86Jl04z1vA3UMAJ+mQ9P0+WLYzEdxx3OmChw/CQOQk2n3Q/civV7prhkf4Qs58uw6Eg2dGmcP5+z5NeC2J/egxQROoSgUpbUf0W/UDEApjAzAIuzDIXOLwXqqf4b7NKfvCiycCQvk9fTWd14AuTfh/qjwKaP4dEkkmDjR7/mvan5M/mxs82QZIMDW6THYvAnkQ0715Ai4C1+WE1gvzpLbtfJxZhngigDi1YpG3uLf2D7PwKNWc6A6OGpW36GB0nlT3kns13xxmMauxhBJW78=

-# repro1.pkgbuild.com
-repro1.pkgbuild.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKYR9cx4+umxrRJ68vvqOmCSkYuZJDkYAAxlT+bbKNnA2R5jpuxvLamGPFfdAzAQjk5FRnbNGihMI2V2Fw8M2gQ=
-repro1.pkgbuild.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrJCFjvo5svIzF5d7agm1/QlqyYlegxSX6GebZp6E5c
-repro1.pkgbuild.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQD3HSegYNMLbTKoQzei6mNyEPdSNHAS8oA/9XKWPjwJ/TFaP/ouesAxCjVJ3UxIVPNTC78bVVf3IsjginT4CmUUOfiFhZ5LEY9DnLzJHny4SHZR0JhhHJFHYqGk4J46S5GOD48kMDAm7pfZU6zTydsEEc5ym+aEihN48x4SCPikQaPPEZVV8OwfqE7MH0/PWNMiytPmfte73E4+7gXmfD5lHz2pgdhLkcaHzhkarpMHJVMhqwb6hqX2VBoI+2eJZSY8WU0qzPE3mNRXqhr87Rz4pcVkSm+g9euhmFChN1tTyszo3Qd6vdDYZd5eiSOzPtjzmIAYIrFVCZYjKW8aw7YhvujjDrl1SaD0+fIbssWb22GViB2PQZ0crvM1r8LElLPOOIdCEyxZ87bL2omDQLCmicQ28dCB0TcR/ezgjigleoIUor49ybyp2WclRK4FawFRF99CujPlqJrW8NACc0zjnZXCue5raqUA1zVOJCEg+BpWc9VD2zR8ZOG8w3PuAus=
-
 # repro2.pkgbuild.com
 repro2.pkgbuild.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE/RhEBp4KFplFM6l/oLUc1aNeQtKXi+dGmP6JUtdLNfHg6TVfDFQDVQo7gIFSTulvOybsccJeJWjYBAmPhsvFs=
 repro2.pkgbuild.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICYgWZak/Rud9WuGQNiDoSLgOOOey+6ig415au8PfI8S
 repro2.pkgbuild.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDIKntcMeZrr1qi4oQx5BKFpsZQpxszAOH9bX/k1Xv2Owf7mmJscYXniyOG0PQlQrzUhFdQ1ZyI2RVXyqWboSwjq2TZNu7t41AUelB1WW9WCCRtULxKeskj6I+FTIWmNweBf4JK1VxmaFxceuN1KZsIxzdw0TyZB0Ub52RD7xNdtc65cvFV9wbLVmXYLORko0rIJcLxwuyPDkjUoap6kLGUULyPzmU92RuE8A+flPVg4lctBWJu2o18os/611qbaZUqL2mQl0ngJYSGwf1NXb5QHhRQw26HcO2OdJONMRGxlSBTfNmy0QmTFY7i7jFF09bhtHcsOnEhdrBoyH1VAYc2Ltr/gC61gOKhFGvtkMg5DJCRjiQ1h+CQqMXY9kzHfHQ1QxmfyMHkBgSB6Y0JPqc0eiaUWx+HYvMWpSme67mO5z0DodQcMVAK4YLT4s9LOqMGtuEtr/psW/1OVJoIJ5JpKeBKgX1605uGkiqw7ieXL+a/77ij2DzNRykW0hhLgwM=

+# repro3.pkgbuild.com
+repro3.pkgbuild.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHOdhydSoh7wFh/aoj21ptqFqxaFa90rtaj63EiMbAWYfUYxpssGW43q7zdSnFTBu90PhBkC5IfqyhKbXzIT5h4=
+repro3.pkgbuild.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICkSp0s4uEwxwcljNmB06CJJ0xcP+bMnboGZzLvIOdbk
+repro3.pkgbuild.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC2+2YzeKfZeawD6hxcHyAvf19xDR83QQXpv7VAqzp8pj7Nbe6BB+XrQzJHwvXdExaFl2gk3hWY3ZvNiBCyCHwU/wU1bAsXfIhzsxq3G3cWRNzeZsOF3gp/jzuEUKSDoYERYS849NqxnAlA+TD9td1AkOivDF9FqcV8XXg5g2qRJNaN7lzPPTmksJ/dpCV2x45x3x0vQdCFidrxr4oVM8U1iyiTTcw+xgcV0wbZanP2EBh2oYqgqrADOK5jRvGCsuLfqz1/mpT9S3T/6OPeAVklpjwGt3QaxFPgq5Y4WvYk4ba8QDuX3yXIg8aXcxQQvwRpuGy21pV2WwpbTFj4I3Ceyy9qw3FX6wJBiR2VvrCs7dcglcXuqIQmcMOqO4440YagyVqyWtv/BQXB7HFc2rzBPA5DqbetKGLLAh1lveD7LV3LNahoc72IUp7+rVgpkmsDKYToKV08L4Z2joQLttqX2q06TQHNXG1UGgXj7Vm9uurI0porPmt74s9v3Q6Qir8=
+
 # reproducible.archlinux.org
 reproducible.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCs2GNtPdFkb9iiclsKjMvvTygCj1up0rKqhTYSC8GFFWgZtE1lsNjSEiFm9fQ0ihYciUfLWh9TlIsQpmVE33zg=
 reproducible.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDjL6uJx0faep1bFH6WdydUJ5YvLAoYpbwXqP7FAYA3y
@@ -165,10 +155,10 @@ runner1.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbm
 runner1.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP+eji5tWpLLWOJKqWJSW2niUQNxPaY+AeKXxFCQ+u+9
 runner1.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDHnXZd8LCb5qKbKFUNVYDNRCRFhmm7bjx1uMhy6yrSj5D7S1LacCra4qPLpQmhDZOgcslRzUue7ZHr+TNbYFxkBc2SsffkqgPovdkpMc4JkSA652vAqzeQKVcIhpgh7nk96JAlTP9y598Ud574CTIxzIXgldr6n+9UMqErSg1tlCXCkCBQ7aA/TVKWoVSRrdTJdWwzEUqv3espq4MN7H4gJLJMyqEDlYIYXuiKU0PSBC+piyPu0PZto6cTLY/l9gvcTmF9XM6Z8KIXuz7KHSsXF594SI8712WW2o7l2VyQhHkwg7E1YTEcZ3L7+g3Qci1Pzpu+85dkg8dyVJ8VvBAAroybB93WZQKC9q3w55rReoVhOohoL2HDTcpKo7gE36r7L1CfyS959x52v0QA99U6IQS1u9apoMhIa83QPSCbnSzhBlXesBR6hTuxEDapBUxEmqGa2gMoEli0VSOpNJHFUiDGzxTPhODcZnoqm3VRlVSJmyqpev/9AxgPdF0l4fs=

-# runner2.archlinux.org
-runner2.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBUZk2jW9uO9Hnjmbf9Bnpm2/HrR5vg8wpVPIUgcSQhkoU7B54j28UgVvnmcEeoD9gyO9gH9gJG9xN95kM3JobI=
-runner2.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINIyyRcCSU/To0KfALKiFpkl1tEC3KyRInma0CpNzV21
-runner2.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDDsrqKPP7n9XWUGulIsEs5Cw5lf6cGJzZXzLPropKoTpsF84qo9sbv7EZ87rgcicwPxcdJ/fXW07so1fBT0txCtKAdW6fb5cJA5wCgKwNUEHjtaBmv28DfP5ZJwS4OtzqBGV/2b6Us2g3GHNU9eulE39z/ZLXvp2dz6cvAw3l9zR/d8703qSWoHMuF4h+fxAhBwsfm11mBf8sknhBNuXGDM9+dqF+b/Y1DlvXMP4+7lpPAj10+ncXUE0CrOLMO5WCyJ95Jx7LTewIb0kFLNpHa9CeTrZs9L5/GWs8YF29skmg+gFNTB2gOLdKoWrgEQ9oqbPoQWXj8mda8EtTehEWlqv8AlLmSM83nrcxbLSV2iM8HINpguhIZAENAbLmiOV4L+40TdSkqMVlb6xJVOsHg27NEWMzRbSpjmdQy7NfdvkzBCDnH0Odn+o2YvZJAZwX9shknBE74J6PQQ7RGPgW5JhEcJFR2Sv7S+Mv6QXi5pNy/F5+AH3qKF0sUam9TLU0=
+# runner3.archlinux.org
+runner3.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE4M5lYIfwT8izv8F8B7Xw05pzFK3tW2lwcLM2dYXF8KDDRLIuRGyWoO+TbUzs5UTTiYGVXpL7JVKzTcmPCkFZI=
+runner3.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJKfT1VLRkueZlsCIc0YlCeoxastyHX1L5vnYcJra6ck
+runner3.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDQYBCuQHWQqGpt6RBLAy/sBbHdXDZUOm0c2PpRfHfZMagyXzpLLgQDAikVPT2JddxQXY78H96+B+10IPeFLFdZVV2X85VaDeGPHHwte6zK+cs4CpWwA5aUMk7IScZi76Dmmyqw/jSBHv3+8M/9iPyk3JS98In0Hr28eOXKy7gdIdaxr6p2LCsug0u0UCBAPxIIeb/IR/bPmspUTkC+vzK8S41kQUDsJVDZCZyzNIFQ/0xunIY4muhzpW5I4fFiSRAGLyUXH+qrK4X17CaTbUwz90Z5/6WS6kE+X3FPOJXkAx3fRps3dM4cqidUp9hnSDD8Cc+QtRymyYpXcQ/ScIefoUC5yt/40Q3qDm/Va/fMSq44I4Tj/OrLOtrq1RlN+GoB5YvzGB4rVpz1VPBz3mqwOCkxAHujk/wgK8zTngfGEZslEcw6kEneaiWfBxib4LAO8M/5uRZkaDCMdyL6D7EqcdO4odNaKMvYhjGV5OCC5gUTtbMj0CEA1tO6INZmzF8=

 # secure-runner1.archlinux.org
 secure-runner1.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDYKjMX9Q/r9E9kP4ZMfDvGVpDO2CplnEYoLjRQrsg1GshHhLiBqYKOytrejRH7lm2a7R0zBT+/z7csPBAsyKu4=
@@ -180,11 +170,21 @@ security.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIb
 security.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIqO7Y5B1+LN3D5dwj27kX+oCcJf1LPUCRZY45Xc6/58
 security.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxRzMwXBd76mKp0YdOBjMuS4rXSSHXuilBNqTqpHcaJdzBG6PX7YYes5AIaJkp/5eoXzH1RpvTKuSr5Wp+rk23gsDSdKlo1F7fNM2htv5I3UZn7b/zr4mPoV6UMtgmYt2dh1PU3YsIyAb35iA+mZHha6a5hXqdbhCzJKPsw5GuAg7Xafvz75W6XiRUW6CRhFtWVdaQfP3Lgs7HvQY9WFpkIBnnzCTs/ZaaR5E0/ayO20rcasrk0NiopGqc+2d5NL6p8P9zf/+2/BNo5fQThM5h4bqogvTbedbWxuO5vuzjY4r0CGTQrfQiLDpcfc311RcXiY8TYPODa8V6WJj67mNJ+/KfVy7croWciJiF5l2xDdujGESO7cIhLPggcvIKFZuEuxBL/I31C2NpTnpgc+K9DmnaBB8n3+C9ZK9RYP5dg1JgYUSXGdP1Y2ZXOx4OOGFssNQg542Bz25uMxg7hNj50bzwHfHlBPY1ECWH/peChzaBKz2xOMo4FnaHSQs855E=

+# seoul.mirror.pkgbuild.com
+seoul.mirror.pkgbuild.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFh48io3Re+4mfhin3uKVhBpbCkGPO/gCkALvnexh2DMYkyGqIU8j8TKZURAjakiogpPRk3njNWDebVR49Cm53I=
+seoul.mirror.pkgbuild.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG2CcYGOATg32dRrjempcqiHfYVVHc5pktyRrTj3BMXO
+seoul.mirror.pkgbuild.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDDA7v8iaGIHszPIQTbsOHX0gHE3IIArfpshIGzIz4n3mjraFY0yFhew2WY1lc3sBIvEdoM9FX/Ch4bdBYhjEbkWZ0OurskzACOthioF4y77IC7ZmQvZwY8OX9mXi2cozhHaP24vH7zD9XqpU1l6gPfedcD1JPXksNqpBPvMxkbCDPmUKzJ7MrcmrZeBnGErH9G9ZRmFvyg1lgZaVEVHoIAu4kDf/ip5Z8U/lMedTNoVKn39QltfPWKHAKj42/yruHMPmorkGW/AwEdRWKE1e5cynpqy3Lh7fFhvwriKOJVedKdi9L/urMo5wVKun5JpZ5wE4CAKj4A4ZNT0o7N8VNzKwnjoZ+BEKrSQfqM8AeRAhTZjKUmAVDNjsnGIRJtwJ1rguEgCjfZtuF8IAjCZ9Q1sSlOrh/2dJkQeFsuJ/inWOgkHtlV7t6FsFAH0pM4sYbZ/lUEd3He8ddz1yZF/lW/kQVY80asqjpwnIYPsxsoJgqltdh2KsCUOFA1WJSnM+c=
+
 # state.archlinux.org
 state.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBB2HL4mX0ma/+jI39lCn0V8+5V+C2kz8BoWxJUME8VYFP8yQo93t0mYylUWRTfcK58RhFsfHfRuEflndeRlLqEk=
 state.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFbZyVxaIdyd5f/dhPN7qGBnOSpLCYzoEqAKuakhi5ou
 state.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCoH0lD8Je2KUktA0RWREiN9v2oIpl/kTZfXZw7LhBaJLdZorqGLI/Nu0Kzb+7Wp0RvcNi5eOpLtFctAwIEs2nEvkPHmKH70KoMBiNNzMWHK6IwTH0EdyYQzjOm4E7qWtbIdK6vSUqtLwgkfaUJ+EokJu51632hmTE2Bk0I12K93hjODmZnM7GhGmSx6h+3KrYfkCz4a2PXVpTptvTTl5t4SkFQMdioQ6k+1m2itjhhEujkewl4N6rar6jB6b4yGHlPZN5Y3lmYaQhraZwen6kuPHfjuMjtkf6lR0cqoK7FvwwrkiXcuGqS8xcVYmRsqRQdXZzLORcMSW4wjlizwQCd

+# sydney.mirror.pkgbuild.com
+sydney.mirror.pkgbuild.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEwRtSfnV4CCizLa2xWLaCw0QWXVacGRiN1ensZchE8lEDHSUu1jd4RmhvESdOHjHysDkIYC53bskRqoNwDoKKA=
+sydney.mirror.pkgbuild.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHshl6kmCVOiNAYTuHfF42z0sPQuUBHvtmDvtWf0LecZ
+sydney.mirror.pkgbuild.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCdDy3Zi0vKgF9RSOfPF8ymZM6mBvwdpWKfNrwx9CuK1HKwJ6jWoYmNfb7AXchwHHad3Pdt7eF2C1dtHxIeupoaEDQ6UY3xai/N10Fo11o4wBPsqwIluf8FTPWG4ACVZiAbACDDgJf9od7AvTHMbou/IeYIlk9diuJBdgAxlvpi2Cgj14oD8J+he3yO6YxrvbSKtviA9EA5H6XCUTBoRDdEHrpTQa8Tp9fUU4jXMP5xyXlbmb+wcG1xDq/DluI1S8svqpgwVCV5tgelyXwD5L0FtuXY7QWj6VY7BCit4z7BLGXJE/0ZI5CYfGpBn2ad6IuQ3ujwzF4aWONkOK7guSgTQ73fKCeAVYrsK6i94i9DjVuHsSQztLL0ZVkbSY1zb3iSHNtGRxXtiAu7IIVCyVRLmedV2Dt2QvfkmS+r6My+xI1hanmgID6gvRFuOHhMRbjP88NqXN0tdmk1O6EdPEoyFp1EmLTq410ttTmWjLHF9Ee8qfuC0Fnh+/qVkacMzmE=
+
 # wiki.archlinux.org
 wiki.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFtDdXEOfPTQfdsZGHIHRtYZaXZLV6lFddU0LkzyxlsYhHf84sWDSMKrQcJn6ywBInh00K8BE90N6H+mOgiLaeY=
 wiki.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILFxxvRi7khrt6mUQGiXX35O1MBrrDeEmvaAnWo9ql/7

--- a/group_vars/all/archusers.yml
+++ b/group_vars/all/archusers.yml
@@ -12,11 +12,6 @@ arch_users:
  accounts:
    name: ""
    groups: []
-  aginiewicz:
-    name: "Andrzej Giniewicz"
-    ssh_key: aginiewicz.pub
-    groups:
-      - tu
  ainola:
    name: "Brett Cornwall"
    ssh_key: ainola.pub
@@ -91,6 +86,11 @@ arch_users:
    groups:
      - dev
      - tu
+  antiz:
+    name: "Robin Candau"
+    ssh_key: antiz.pub
+    groups:
+      - tu
  archange:
    name: "Bruno Pagani"
    ssh_key: archange.pub
@@ -124,6 +124,11 @@ arch_users:
    ssh_key: bgyorgy.pub
    groups:
      - tu
+  blakkheim:
+    name: "T.J. Townsend"
+    ssh_key: blakkheim.pub
+    groups:
+      - tu
  bluewind:
    name: "Florian Pritz"
    ssh_key: bluewind.pub
@@ -341,13 +346,6 @@ arch_users:
      - dev
      - multilib
      - tu
-  kevr:
-    name: "Kevin Morris"
-    ssh_key: kevr.pub
-    hosts:
-      - mail.archlinux.org
-    groups:
-      - support-staff
  kewl:
    name: "Kewl FFT"
    ssh_key: kewl.pub
@@ -359,13 +357,8 @@ arch_users:
    name: "Konstantin Gizdov"
    ssh_key: kgizdov.pub
    groups:
+      - dev
      - tu
-  kkeen:
-    name: "Kyle Keen"
-    ssh_key: kkeen.pub
-    groups:
-      - tu
-      - multilib
  klausenbusk:
    name: "Kristian Klausen"
    ssh_key: klausenbusk.pub
@@ -373,10 +366,6 @@ arch_users:
      - mail.archlinux.org
    groups:
      - support-staff
-    additional_ssh_keys:
-      - name: klausenbusk_2.pub
-        hosts:
-          - all
  lahwaacz:
    name: "Jakub Klinkovský"
    ssh_key: lahwaacz.pub
@@ -442,6 +431,13 @@ arch_users:
      - dev
      - multilib
      - tu
+  pitastrudl:
+    name: "Arun Bahl"
+    ssh_key: pitastrudl.pub
+    hosts:
+      - mail.archlinux.org
+    groups:
+      - support-staff
  polyzen:
    name: "Daniel M. Capella"
    ssh_key: polyzen.pub
@@ -478,6 +474,11 @@ arch_users:
      - dev
      - tu
      - multilib
+  serebit:
+    name: "Campbell Jones"
+    ssh_key: serebit.pub
+    groups:
+      - tu
  shibumi:
    name: "Christian Rebischke"
    ssh_key: shibumi.pub
@@ -518,11 +519,6 @@ arch_users:
    ssh_key: segaja.pub
    groups:
      - tu
-  sudoforge:
-    name: "Benjamin Denhartog"
-    ssh_key: sudoforge.pub
-    groups:
-      - tu
  svenstaro:
    name: "Sven-Hendrik Haase"
    ssh_key: svenstaro.pub
@@ -530,11 +526,6 @@ arch_users:
      - dev
      - tu
      - multilib
-  tensor5:
-    name: "Nicola Squartini"
-    ssh_key: tensor5.pub
-    groups:
-      - tu
  torxed:
    name: "Anton Hvornum"
    ssh_key: torxed.pub
@@ -542,6 +533,11 @@ arch_users:
      - mail.archlinux.org
    groups:
      - support-staff
+  tpkessler:
+    name: "Torsten Keßler"
+    ssh_key: tpkessler.pub
+    groups:
+      - tu
  tpowa:
    name: "Tobias Powalowski"
    ssh_key: tpowa.pub
@@ -563,6 +559,7 @@ arch_users:
    name: "Chih-Hsuan Yen"
    ssh_key: yan12125.pub
    groups:
+      - multilib
      - tu

 # utility accounts to protect from the "disable ssh keys of disabled users" task

--- a/group_vars/all/common.yml
+++ b/group_vars/all/common.yml
@@ -11,9 +11,3 @@ maintenance_remote_machine: "{{ hostvars[inventory_hostname]['ansible_env'].SSH_
 # prometheus-node-exporter port
 prometheus_exporter_port: '9100'
 prometheus_memcached_exporter_port: '9150'
-
-fail2ban_jails:
-  sshd: true
-  postfix: false
-  dovecot: false
-  nginx_limit_req: false
--- a/group_vars/all/geo.yml
+++ b/group_vars/all/geo.yml
 geo_acme_dns_challenge_ns: redirect.archlinux.org
 geo_domains:
  - geo.mirror.pkgbuild.com
+  - riscv.mirror.pkgbuild.com
+# geo_options.*.hosts defaults to "{{ groups['geo_mirrors'] }}"
 geo_options:
  geo.mirror.pkgbuild.com:
    health_check_path: /lastupdate
+  riscv.mirror.pkgbuild.com:
+    health_check_path: /.status/lastupdate.txt
--- a/group_vars/all/root_access.yml
+++ b/group_vars/all/root_access.yml
@@ -9,6 +9,7 @@ sudo_users:
  - svenstaro
  - anthraxx
  - klausenbusk
+  - artafinde

 # deploy tag 'root_ssh' when this changes
 root_ssh_keys:
@@ -20,14 +21,7 @@ root_ssh_keys:
  - key: svenstaro.pub
  - key: anthraxx.pub
  - key: klausenbusk.pub
-    additional_keys: [klausenbusk_2.pub]
  - key: artafinde.pub
-    hosts:
-      - dashboards.archlinux.org
-      - gitlab.archlinux.org
-      - monitoring.archlinux.org
-      - lists.archlinux.org
-      - mailman3.archlinux.org

 # - run 'playbooks/tasks/reencrypt-vault-{super,default}-key.yml' when this
 #   changes; before doing so, make sure to 'gpg --lsign-key' all listed keys
@@ -43,6 +37,7 @@ vault_super_pgpkeys: &vault_super_pgpkeys
  - 8FC15A064950A99DD1BD14DD39E4B877E62EB915  # svenstaro
  - E240B57E2C4630BA768E2F26FC1B547C8D8172C8  # anthraxx
  - DB650286BD9EAE39890D3FE6FE3DC1668CB24956  # klausenbusk
+  - B4B759625D4633430B74877059E43E106B247368  # artafinde

 # - run 'playbooks/tasks/reencrypt-vault-default-key.yml' when this changes
 # - before running it, make sure to 'gpg --lsign-key' all keys listed below
@@ -50,4 +45,3 @@ vault_super_pgpkeys: &vault_super_pgpkeys
 #   is working by running `ansible-vault view misc/vaults/vault_hcloud.yml`
 vault_default_pgpkeys:
  - *vault_super_pgpkeys
-  - B4B759625D4633430B74877059E43E106B247368  # artafinde
--- a/group_vars/all/vault_goaurrpc.yml
+++ b/group_vars/all/vault_goaurrpc.yml
+$ANSIBLE_VAULT;1.1;AES256
+64356530383261396436353036356166656231363964356266313061393935636365353931333632
+3566333830343965653766316236633563353662633031610a663030643166313432336337346430
+35326662346566383630653433633230613665333264313036303038663063366561636466633635
+6131656134333232640a386363643834383363643665343333653531653231346565393764366137
+35303637316530623136373838626536373265633836623937326234353133383235646461343635
+31346335353939333532336463616130323338316236376163383033313134323133333539613139
+623764623337366432393537353733613538
--- a/group_vars/all/vault_mailman.yml
+++ b/group_vars/all/vault_mailman.yml
 $ANSIBLE_VAULT;1.1;AES256
-38306134633332383131393237386134643236316136333335313130663639373434643434303734
-6530323361333765393633616338333830346634363835350a363933363736393935333833313461
-66336437366666316366326566313837653934333732336532393264343663643861633639636566
-3330353837636631320a303533653661623866383230353563366166653232316635353631613836
-39306531623538656335643031623361633465366138356263663630386362626630336262303865
-31306465323730316633316534333663313565336634346164363331353962366239663035366139
-33636139666262663962396236396337666336663835633865373966386534393064323333326164
-35643530656134643565
+63633533303232373335663630346139613137616132393738383265663337636565663935386365
+3262636536383962333438653033323061306433323232610a623836643732616163383364316639
+37626134643334383432346465343734353566663261643334396563336132666133666431313563
+6365643566626635360a616139393131346566666266653737303562663664656231643836373038
+37316436643133333261313963356435353938393032313935353939613962303733623934313965
+64356635626561376130336134656436386638306538373635313638393932313337316636343533
+32666138613765326332373335366634313530656162383162633861666365333230303132346263
+63613031643230356361383638386230613231626135663763373630666362623536663165356335
+33333033376332653130626262633563336238383931393636346339333963326330373431363931
+61383733626363316539653638373562616335366363306365353166666335383037633830636263
+37313663636139666131623435383833313434396665663162623934646330626362346237363331
+65323537383536333763646431623061646337613761363861373261343638653235333038663239
+34636662663763363832643061313035316437633965346332363432653562613865623261613235
+61303239626136303736356533373739343566313464343931383962633232313263383230336438
+32653534623739616436346539616336373562376632303833323230643465666262303263383334
+64623362363863393866666461396237613934656239653262316438633338313036303436313236
+61623562376139616539646231376438636234656363666639646465663035326161346435396439
+63613839396163616135313537626535393039623866646431333239383263313931386131303464
+36353837303662343530663561363036633864346131343731643535386462316663353233636638
+36323134643230376239326637656537633337323333616630313531653239366263386238363333
+32336538613635613964366562383165616433363738623638393364363233636262643131653532
+62326363356333333563383139323366363462613031303566376365643439373163613166333339
+38353266616463396139336663353536336631666565656630396431363439333034653336316234
+61663232383136353937336431353131323933613462666233663464656166356161613039316436
+3136
--- a/group_vars/all/vault_mailman3.yml
+++ b/group_vars/all/vault_mailman3.yml
-$ANSIBLE_VAULT;1.1;AES256
-63633533303232373335663630346139613137616132393738383265663337636565663935386365
-3262636536383962333438653033323061306433323232610a623836643732616163383364316639
-37626134643334383432346465343734353566663261643334396563336132666133666431313563
-6365643566626635360a616139393131346566666266653737303562663664656231643836373038
-37316436643133333261313963356435353938393032313935353939613962303733623934313965
-64356635626561376130336134656436386638306538373635313638393932313337316636343533
-32666138613765326332373335366634313530656162383162633861666365333230303132346263
-63613031643230356361383638386230613231626135663763373630666362623536663165356335
-33333033376332653130626262633563336238383931393636346339333963326330373431363931
-61383733626363316539653638373562616335366363306365353166666335383037633830636263
-37313663636139666131623435383833313434396665663162623934646330626362346237363331
-65323537383536333763646431623061646337613761363861373261343638653235333038663239
-34636662663763363832643061313035316437633965346332363432653562613865623261613235
-61303239626136303736356533373739343566313464343931383962633232313263383230336438
-32653534623739616436346539616336373562376632303833323230643465666262303263383334
-64623362363863393866666461396237613934656239653262316438633338313036303436313236
-61623562376139616539646231376438636234656363666639646465663035326161346435396439
-63613839396163616135313537626535393039623866646431333239383263313931386131303464
-36353837303662343530663561363036633864346131343731643535386462316663353233636638
-36323134643230376239326637656537633337323333616630313531653239366263386238363333
-32336538613635613964366562383165616433363738623638393364363233636262643131653532
-62326363356333333563383139323366363462613031303566376365643439373163613166333339
-38353266616463396139336663353536336631666565656630396431363439333034653336316234
-61663232383136353937336431353131323933613462666233663464656166356161613039316436
-3136
--- a/group_vars/geo_mirrors/misc.yml
+++ b/group_vars/geo_mirrors/misc.yml
 certbot_dns_support: true
-geo_mirror_domain: "geo.mirror.pkgbuild.com"
+geo_mirror_domain: geo.mirror.pkgbuild.com
--- a/group_vars/mirrors/mirrorsync.yml
+++ b/group_vars/mirrors/mirrorsync.yml
+mirrorsync_mirrors:
+  archive:
+    hosts: "{{ groups['archive_mirrors'] }}"
+    source: rsync://rsync.archlinux.org/archive
+    target: /srv/archive
+    last_update_url: https://archive.archlinux.org/repos/last/lastupdate
+    last_update_dst: lastupdate
+    delay_updates: false
+  debug:
+    hosts: "{{ groups['geo_mirrors'] + ['debuginfod.archlinux.org'] }}"
+    source: rsync://rsync.archlinux.org/debug_packages
+    target: /srv/ftp
+    last_update_url: https://rsync.archlinux.org/lastupdate
+    last_update_dst: lastupdate
+    rsync_options:
+      - --include="*-debug/***"
+      - --include="pool/"
+      - --include="pool/*-debug/***"
+      - --exclude="*"
+  repo:
+    hosts: "{{ groups['mirrors'] + ['build.archlinux.org'] }}"
+    source: rsync://rsync.archlinux.org/ftp_tier1
+    target: /srv/ftp
+    last_update_url: https://rsync.archlinux.org/lastupdate
+    last_update_dst: lastupdate
+    save_lastsync: true
+    rsync_options:
+      - --exclude="/other"
+      - --exclude="/sources"
+      - --exclude="*-debug/"
+  riscv:
+    hosts: "{{ groups['geo_mirrors'] }}"
+    mirror_domain: riscv.mirror.pkgbuild.com
+    source: rsync://archriscv.felixc.at/archriscv
+    target: /srv/riscv
+    last_update_url: https://archriscv.felixc.at/.status/lastupdate.txt
+    last_update_dst: .status/lastupdate.txt
--- a/host_vars/asia.mirror.pkgbuild.com/misc
+++ b/host_vars/asia.mirror.pkgbuild.com/misc
@@ -9,7 +9,7 @@ ipv6_address: "2a02:6ea0:d605::2"
 ipv6_netmask: "/128"
 ipv6_gateway: "2a02:6ea0:d605::1337"
 filesystem: "btrfs"
-network_interface: "enp1s0f0"
+network_interface: "enp175s0f0"
 system_disks:
  - /dev/sda
  - /dev/sdb

--- a/host_vars/aur.archlinux.org/misc
+++ b/host_vars/aur.archlinux.org/misc
 filesystem: btrfs
 memcached_socket: "/run/memcached/aurweb.sock"
+sshd_enable_includes: true
 wireguard_address: 10.0.0.2
 wireguard_public_key: TPLeGQ7qU6ZNtcgDbEV0SSYScvK+XS5igcPdGSXo6UA=
No results found