From af5d4b845ec4e92f11f9f781a51257fece267404 Mon Sep 17 00:00:00 2001
From: Kristian Klausen <kristian@klausen.dk>
Date: Mon, 11 Apr 2022 14:50:41 +0200
Subject: [PATCH] Decommission aur-dev
With the PHP->Python port done[1][2], there isn't much need for aur-dev
anynmore. Most things can also be tested locally and aur-dev haven't got
any love since the port (ex: allowing the aurweb maintainers to deploy
without asking DevOps).
[1] https://lists.archlinux.org/pipermail/aur-general/2022-February/036786.html
[2] https://gitlab.archlinux.org/archlinux/infrastructure/-/merge_requests/525
---
docs/servers.md | 8 -------
docs/ssh-hostkeys.txt | 11 ----------
docs/ssh-known_hosts.txt | 5 -----
host_vars/aur-dev.archlinux.org/misc | 5 -----
.../aur-dev.archlinux.org/vault_aurweb.yml | 16 --------------
.../aur-dev.archlinux.org/vault_wireguard.yml | 9 --------
hosts | 4 ----
playbooks/aur-dev.archlinux.org.yml | 22 -------------------
roles/prometheus/defaults/main.yml | 1 -
tf-stage1/archlinux.tf | 4 ----
10 files changed, 85 deletions(-)
delete mode 100644 host_vars/aur-dev.archlinux.org/misc
delete mode 100644 host_vars/aur-dev.archlinux.org/vault_aurweb.yml
delete mode 100644 host_vars/aur-dev.archlinux.org/vault_wireguard.yml
delete mode 100644 playbooks/aur-dev.archlinux.org.yml
diff --git a/docs/servers.md b/docs/servers.md
index 0ddb08bcc..db8244021 100644
--- a/docs/servers.md
+++ b/docs/servers.md
@@ -26,14 +26,6 @@
### Services
- aurweb
-## aur-dev.archlinux.org
-
-### Services
- - aurweb deployed with the `pu` branch
-
- The database is filled using the `./schema/gendummydata.py` script in the aurweb repository with a
- modification to create suspended users. Test users can sign up using the normal registration flow.
-
## bugs.archlinux.org
### Services
diff --git a/docs/ssh-hostkeys.txt b/docs/ssh-hostkeys.txt
index 125a97470..5d949146a 100644
--- a/docs/ssh-hostkeys.txt
+++ b/docs/ssh-hostkeys.txt
@@ -42,17 +42,6 @@
256 MD5:f9:3b:1f:ac:be:b6:15:67:07:02:30:48:eb:c0:30:eb root@archive1.mirror.pkgbuild.com (ED25519)
3072 MD5:84:04:71:14:38:34:e0:c4:a3:fa:7c:3f:ee:e2:ed:59 root@archive1.mirror.pkgbuild.com (RSA)
-# aur-dev.archlinux.org
-1024 SHA256:VzUmG0B+Yb1mrcXVnJI0dMECOgi+7oIwW2PhPvOUhkw root@archlinux-packer (DSA)
-256 SHA256:KFBhxP4afMhI5dqHMJwIrbuJ9/EzlHsdXxJ5cwiTMbg root@archlinux-packer (ECDSA)
-256 SHA256:sXSwFaVRLiHi1081XoEZg9fE1t0ZOQxWcMocNdWETAA root@archlinux-packer (ED25519)
-3072 SHA256:yQCBknJ9mSz2QC1jwWTToGHgtwwT/kgvWKHqWkk/NyQ root@archlinux-packer (RSA)
-
-1024 MD5:c7:7b:16:f0:1d:13:04:2c:49:d6:0a:48:d7:6f:d7:25 root@archlinux-packer (DSA)
-256 MD5:ad:6f:76:8c:bb:ca:b0:3d:f4:6d:d4:23:87:c5:98:6e root@archlinux-packer (ECDSA)
-256 MD5:9f:97:8b:35:ba:10:3a:4a:b2:c4:6f:0d:e2:77:58:ed root@archlinux-packer (ED25519)
-3072 MD5:cc:4b:ef:cb:3f:4a:23:02:6f:c4:25:cc:b4:e1:a0:a8 root@archlinux-packer (RSA)
-
# aur.archlinux.org
1024 SHA256:kFn1IwQmUEVtiiBLYyShUr/H1614PXs49jM2dXDp5z4 root@archlinux-packer (DSA)
256 SHA256:uTa/0PndEgPZTf76e1DFqXKJEXKsn7m9ivhLQtzGOCI root@archlinux-packer (ECDSA)
diff --git a/docs/ssh-known_hosts.txt b/docs/ssh-known_hosts.txt
index 945c327c5..4821545fd 100644
--- a/docs/ssh-known_hosts.txt
+++ b/docs/ssh-known_hosts.txt
@@ -30,11 +30,6 @@ asia.mirror.pkgbuild.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAA
asia.mirror.pkgbuild.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAL29ty9q8ojSshxgwTPm1thbBX2ioli2LONf7SJa959
asia.mirror.pkgbuild.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC1IhNA7ozz1BdmRGI5BJMS2dkCoxfMf3Jr5Q/CEPe4MOoO13+DSBW7EAm/1stwkCTKSnmPqpQcAW+CZU8bx72S/8OChAssgZq/5AP82xcv4zZtarQqa95EddcvsG1kVcIT94Yd+dIGFMgNjJMbUkOthmaENaDnZKgS7gjs4B0Pd3NKXu9McM1+tgusc9nKL+2yxndnyip/dBFDl4UwJWl0YixXpKHMcnnjtpLQ24ZUFsaXqZ+cRSYGUR5h9zvRGjzgyl6gzAc98kfoCrKK28NBwgh086SGiYTe1TlTQYcMBPXEuvk9xRTgB2PWRRzyiYnOM0u+QAd/qTj7SO85g4PpmGP6J7kmZ0WGXyW/c9fwrINy9KYt/h5ZRcpxB/6bDP1FmxTKkfvcHCYMraH/Zfzc9AdgfawC+5ul0PZAxIyni6E9AlKjZKmOvSpHKtoV7DYAvM/AajY43QoRCMsjay4vro116yFZdsWFnqt0iWdhDzKFM30ovbC1WFujIdLdWl8=
-# aur-dev.archlinux.org
-aur-dev.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLbwdgWiWIEZmTmMJtEAyDjvTqTY2hIZTevy3gjYXzTLS65D8Bav1ci6e1DUINflKMbW/n8b8f/Ac0d4Lv7BRm4=
-aur-dev.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPmLqDFITP0IBdJ11sc4QtNHtu/PUwjo5yvVfvcKxCru
-aur-dev.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDBH6h30LEs9Ji7IwPu/uMKLJ02Om0bwIA1iScvGr3+jMZZq01l34NGeSP+L7AHA6pFIBJbYSKs2d4qlXkxt5rBTG4OezO+6XaWN20SIn9QSMvDTeGNi8Na5UUGz6UBiW0pQxHWoh1hkFvWb/EhLD5lN+oHhyiZWe0RCf/XCgCOvCXKTN1SNSbI9yXteKhf2SDtsd2k0SA10k6zYE06JFnjpj2xJ5LExAhpHSvrn9PQYlmHg1buYfKY6WcXH4P062fbRADiA0/EF6GnsiaMsYOMRB5ZoUqA5YhUmuYDMLQWLOGxAkcyyt418eGdmqBnz9fYT5P9gJBxRarkL9MkNr+H9iS+/4NaGXS/NBQ4bshVKqI8AZcJsEqvXnIWllNARb+GuGK6C5Ex3T34QZqW/Qfvmv4lnd0oK3DyyE1bVTiRaNLcU9jxiz3JYVTrx6Z+CaLWccDYwegNtqwftplrradheNT6mrjioZfLAwfQWJ8+Z0ySpAIqIqYKCTWlr5pEtSc=
-
# aur.archlinux.org
aur.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLMiLrP8pVi5BFX2i3vepSUnpedeiewE5XptnUnau+ZoeUOPkpoCgZZuYfpaIQfhhJJI5qgnjJmr4hyJbe/zxow=
aur.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEuBKrPzbawxA/k2g6NcyV5jmqwJ2s+zpgZGZ7tpLIcN
diff --git a/host_vars/aur-dev.archlinux.org/misc b/host_vars/aur-dev.archlinux.org/misc
deleted file mode 100644
index 1e61cb486..000000000
--- a/host_vars/aur-dev.archlinux.org/misc
+++ /dev/null
@@ -1,5 +0,0 @@
----
-filesystem: btrfs
-memcached_socket: "/run/memcached/aurweb.sock"
-wireguard_address: 10.0.0.3
-wireguard_public_key: E4wLmumdWE1oVjWxPL5FU+BiuPxPdJa6K0wLZVlC0ys=
diff --git a/host_vars/aur-dev.archlinux.org/vault_aurweb.yml b/host_vars/aur-dev.archlinux.org/vault_aurweb.yml
deleted file mode 100644
index 28e67f79f..000000000
--- a/host_vars/aur-dev.archlinux.org/vault_aurweb.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-39383039656439366639616262613434333662656462656134386161326565323165313132323766
-3730663133306530393631343662336564656564393537350a373361633364393061663564656230
-31356262393133303833643761343934393437623662653338316665363238636161316262623261
-3338373135336664630a346533316134666337383562653164633930666132326336366263316664
-61396437386363666164323266313461363031326462346461363765653866333838363031663938
-35646166646639343766356563363562363935646365363965303661393966383730323962653532
-35396332303561663838333038636338353331323634373237303835663130386539653761373866
-66346339313265613430363538653264316430323064633033353431343539313135653562393235
-30343363393530396364326566346165623133313430366364326130363633343430353534363364
-62356235336139376438633839333239366362356137643835656365643064316133366365323433
-61383234633836313663633930393437326630363337666239663931333833366338383466373562
-66356366633130383264373565396163366464643231333964623233393938356664363164353565
-63336361636662323830396264383061386534663064336163666338666137326563383831366436
-32633639363639346338306535386563356133373935386635303431333730356138343633353531
-643339663636316331636264366236623036
diff --git a/host_vars/aur-dev.archlinux.org/vault_wireguard.yml b/host_vars/aur-dev.archlinux.org/vault_wireguard.yml
deleted file mode 100644
index 1cbdd2182..000000000
--- a/host_vars/aur-dev.archlinux.org/vault_wireguard.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35373338643430383735666136303462623436376563373865613234336666303166616434333062
-6266353665626536613135303662316165303933336338360a383665313933613532306266306265
-62633635613337306230623866666635616561613162386463653038643533396465373532613731
-6637363030396430380a613137623063666166393733363835323232353131396534326432616230
-64353532633266396264356461313533313838666166633436343839663532346336323036663461
-64613063643764633330383962646665613931303262306232323931353137396635316662623331
-62356530616466346239316262653037306635613363316634383738336166306664643366623664
-36386336383837623130
diff --git a/hosts b/hosts
index 987597c87..9968458ae 100644
--- a/hosts
+++ b/hosts
@@ -20,7 +20,6 @@ europe.mirror.pkgbuild.com
[borg_clients]
archlinux.org
-aur-dev.archlinux.org
state.archlinux.org
matrix.archlinux.org
quassel.archlinux.org
@@ -64,7 +63,6 @@ archlinux.org
bbs.archlinux.org
bugs.archlinux.org
aur.archlinux.org
-aur-dev.archlinux.org
wiki.archlinux.org
patchwork.archlinux.org
security.archlinux.org
@@ -98,7 +96,6 @@ monitoring.archlinux.org
[node_exporters]
archlinux.org
aur.archlinux.org
-aur-dev.archlinux.org
monitoring.archlinux.org
gitlab.archlinux.org
reproducible.archlinux.org
@@ -136,7 +133,6 @@ debuginfod.archlinux.org
[wireguard]
archlinux.org
aur.archlinux.org
-aur-dev.archlinux.org
monitoring.archlinux.org
gitlab.archlinux.org
reproducible.archlinux.org
diff --git a/playbooks/aur-dev.archlinux.org.yml b/playbooks/aur-dev.archlinux.org.yml
deleted file mode 100644
index 415ffd02d..000000000
--- a/playbooks/aur-dev.archlinux.org.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-
-- name: setup aur-dev.archlinux.org
- hosts: aur-dev.archlinux.org
- remote_user: root
- roles:
- - { role: common }
- - { role: sshd, sshd_enable_includes: true }
- - { role: root_ssh }
- - { role: certbot }
- - { role: nginx }
- - { role: mariadb }
- - { role: sudo }
- - { role: redis }
- - { role: uwsgi }
- - { role: borg_client, tags: ["borg"] }
- - { role: postfix_null }
- - { role: fail2ban }
- - { role: aurweb, aurweb_domain: 'aur-dev.archlinux.org', aurweb_version: 'pu' }
- - { role: prometheus_exporters }
- - { role: promtail }
- - { role: wireguard }
diff --git a/roles/prometheus/defaults/main.yml b/roles/prometheus/defaults/main.yml
index 4d1e4f624..791b47d6d 100644
--- a/roles/prometheus/defaults/main.yml
+++ b/roles/prometheus/defaults/main.yml
@@ -23,7 +23,6 @@ blackbox_targets:
- https://asia.archive.pkgbuild.com
- https://asia.mirror.pkgbuild.com
- https://aur.archlinux.org
- - https://aur-dev.archlinux.org
- https://bbs.archlinux.org
- https://bugs.archlinux.org
- https://conf.archlinux.org
diff --git a/tf-stage1/archlinux.tf b/tf-stage1/archlinux.tf
index d82e5b5af..5ca82a87c 100644
--- a/tf-stage1/archlinux.tf
+++ b/tf-stage1/archlinux.tf
@@ -55,10 +55,6 @@ locals {
server_type = "cx11"
domain = "accounts"
}
- "aur-dev.archlinux.org" = {
- server_type = "cpx11"
- domain = "aur-dev"
- }
"aur.archlinux.org" = {
server_type = "cpx41"
domain = "aur"
--
GitLab