Skip to content

Commit 1aa39de

Browse files
christian-heuselchristian-heusel
committed
Rename gemini to archive
Fixes https://gitlab.archlinux.org/archlinux/infrastructure/-/issues/658 Signed-off-by: Christian Heusel <[email protected]>
1 parent f63280b commit 1aa39de

File tree

11 files changed

+32
-33
lines changed

11 files changed

+32
-33
lines changed

‎docs/servers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Table of contents
44
[[_TOC_]]
55

6-
## gemini
6+
## archive.archlinux.org
77

88
### Services
99
- archive (archive.archlinux.org)

‎docs/ssh-hostkeys.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@
1616
256 MD5:4b:0b:1c:81:27:81:7a:22:b4:48:88:75:69:a5:b4:4e [email protected] (ED25519)
1717
3072 MD5:a2:41:dc:97:5a:ae:89:7a:4f:69:f7:ec:a0:d4:67:b6 [email protected] (RSA)
1818

19+
# archive.archlinux.org
20+
256 SHA256:If51DkTftUpDAFz65totgDfTd/ddu/2w/RBZIHtY74U [email protected] (ECDSA)
21+
256 SHA256:wUrJYf9+zOpIEUQ3ndgarK0PjzPICa1frmu7mpL4e14 [email protected] (ED25519)
22+
3072 SHA256:Rltnuln3bjsHJwVbys/LnYCj7hO6srPoa15JP8QhmlQ [email protected] (RSA)
23+
24+
256 MD5:aa:b6:75:97:e1:82:7f:25:16:3c:85:ca:2f:78:97:ee [email protected] (ECDSA)
25+
256 MD5:44:f5:60:54:d7:a7:b7:6d:fd:69:35:05:8f:4e:a5:0f [email protected] (ED25519)
26+
3072 MD5:20:2f:93:37:ae:33:e6:3e:9f:74:b6:57:c9:f3:58:9e [email protected] (RSA)
27+
1928
# archlinux.org
2029
256 SHA256:9nc3jaxyh21w+HVT1Xo0/ujMx7/qWKguqcSiDX7jrA0 root@archlinux-packer (ECDSA)
2130
256 SHA256:nxDSSxkjiccOuzBmqSvsd07WIO/ySIlOMlBxQiTWFaE root@archlinux-packer (ED25519)
@@ -97,15 +106,6 @@
97106
256 MD5:bd:af:e2:cb:6b:fe:b6:60:73:b0:ba:7b:db:af:21:b7 [email protected] (ED25519)
98107
3072 MD5:57:a2:59:db:c7:07:4f:ac:91:9a:f8:db:7f:16:a7:d4 [email protected] (RSA)
99108

100-
# gemini.archlinux.org
101-
256 SHA256:If51DkTftUpDAFz65totgDfTd/ddu/2w/RBZIHtY74U [email protected] (ECDSA)
102-
256 SHA256:wUrJYf9+zOpIEUQ3ndgarK0PjzPICa1frmu7mpL4e14 [email protected] (ED25519)
103-
3072 SHA256:Rltnuln3bjsHJwVbys/LnYCj7hO6srPoa15JP8QhmlQ [email protected] (RSA)
104-
105-
256 MD5:aa:b6:75:97:e1:82:7f:25:16:3c:85:ca:2f:78:97:ee [email protected] (ECDSA)
106-
256 MD5:44:f5:60:54:d7:a7:b7:6d:fd:69:35:05:8f:4e:a5:0f [email protected] (ED25519)
107-
3072 MD5:20:2f:93:37:ae:33:e6:3e:9f:74:b6:57:c9:f3:58:9e [email protected] (RSA)
108-
109109
# gitlab.archlinux.org
110110
256 SHA256:ZHy7zbNNwKHukTEyFcAT2Ns+mT/wlc2vAjJULnlOroE [email protected] (ECDSA)
111111
256 SHA256:KD3Og7bPg9glmODrqUKN0r3Jl18pQ0OVp2MT7xv/bm8 [email protected] (ED25519)

‎docs/ssh-known_hosts.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ america.mirror.pkgbuild.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYA
2020
america.mirror.pkgbuild.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMofe+VPkI+MKGWYkonc5IsTwVmf2OcX8atVgnXkjbqL
2121
america.mirror.pkgbuild.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC+7ePbae+aA+W6JZxhce1qvxnTG6VIEtShFD+/4TlMNFzVxh8DcmD+sw+NCKFshGddKhh3n4TWO68XAxWN4KQzfpgYHgzcoyNR3T1zle2oWfTL29KU3/X4OIvQc3aeqnyAhHvu7vXDnWfZgC1uGu0QecAqJcRxEPkz15OJkZjr/zZt01BUa2y7OUQbSFRckeLoSPQeSNFOQ0hlWCdN0laoHsYPznyievuJJxWMTa9Wkamn+oVx1S95sF1a6PSN8LztCxxXKRTikpau+SCLpPiqd1kV4WXgOPWGoRvQ0PNzOICwmKEeCdw0QfzoNm70FftLvy/bFq7qa1tSvau/SFwRRdnDRlr7dZXLqbXp+si+GD80TL4scUH6LRQJkxL0Z5X/FKOPGutf8BhIovbhoSkiTyY51bDQIXLTCqm1sE2GrEI1CvT5lOvG43C2e8U7bnLw2hQ++GRUct89mI8f/8hHdDllUkUgfsksL7ObMTvkbF6NoCogZjHsTRtwaP0DU/M=
2222

23+
# archive.archlinux.org
24+
archive.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOck5++3KyQYcMl1eknD9opwVewCdrBy4xOQF9eC3gcdq3ZKNyM0hCIwZ8sZbzchtKWiHjjlPtoN3mesohtHUzE=
25+
archive.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG3ghrZI2G6zc3RKzouAOdgfs6TIRpKjcUqO3pmgRFqk
26+
archive.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDL7txJKe2OeqTWTAmuo+nUaBMvgW6NiEN5f5DB+0ZE7ilkNj8tNRV1hxQfDxndzvMe5VzT0NynLh2Zdwzf9aoqyRUGUXMQeAAjq1dDpv5dNVix6NMmsMiv565C3h5B5em6UrOSl7h8vlfXuZIsBRhWda1Gxvu1sqSoMiizwdTPOBL8KWLgkJPeS5oI16j+ssC6xh3Z6RFIaONrFMiXc5xAEHBMwZM9JDM3mPDiT7gY9IS6GKydbOa7eHw9QQaDVaBzTtaszOvMfby/dnnuF9xIhE8d9bes1MwMTd9HlwqLaWADVFlGJICYgAHe7Gz7BhhkFHMuRz9rQ5jRKztMHXXUeDpocleAe71gHr0oq4K+FlDCRnNUHICvLfRUBe7gBo1kZzzzT+pNIEJD2KH2jEMkbukxfFeQ27P3ZWaD8JIi4EfgR5QUilcGAKqXG/9/mFTR2lBhwZdYIYJicbMprqrxNe3Q/8RhxVajguO3C43mbpy2o7XSlvVSW2OUE21C2Uc=
27+
2328
# archlinux.org
2429
archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBB0PUXX25/7fRKiayZos7f1LIG925vOQlnuTE7HuSKiVhiYHi3XB9JyILKaekOb73hNJOUdE8kBEzhXESbrn1mM=
2530
archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBeUGb+Q4QLN8yg1pohasTnfhwO7rNmW7Ih/PTrnmY0V
@@ -65,11 +70,6 @@ europe.mirror.pkgbuild.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAA
6570
europe.mirror.pkgbuild.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF6sVYSrTIVj+xwyC5uJdFVU+X50tAIDEndsnGta75C7
6671
europe.mirror.pkgbuild.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDssgto7Lqfm63rjGMd8R2lf398W3UHJfOx6GhYBUVWYYdkcvjvMLHutZZaiOcPi7RjBsJEIt1Mk8XzesxpcF5eB1vIwvbCvLzbTflNxrEGPbdW916IITZdKeVT/JpqzzgVdttXmULW6uZ93hILlyobeaSCfeWjyyxsCX04Y1vde/LkpkM5+8SbgwyhWE7idKKILg+3MHJG8xK+CEAUGOHT5+FaexJXMPlMY+O/owjU3vBF1omA4kPDh99/OtWhS2ngUFHWJlEb1+Jidfu6naAomFKZEBI6BWd2td/ngn1JcFzrqyjs0hbsnjpb5RhQ1w/z95mLhMhDH+HtCFgAwTOjOOQ+bDcc0wbVwSUmJx7ctzuFWqfTP+ts7xWC5TOmBMfH9TRMr1+A5CS01Nds1w2RW3S+CSy/CQr5/g1+IjyTuJ4fyvJjYhuk6ouLPl7jISX3EmAtDkB5CmBkQKt3OEMGJlPJs0WpArsNT6CqxECxzTbv+Wp1IXQfcJwspl9ESUs=
6772

68-
# gemini.archlinux.org
69-
gemini.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOck5++3KyQYcMl1eknD9opwVewCdrBy4xOQF9eC3gcdq3ZKNyM0hCIwZ8sZbzchtKWiHjjlPtoN3mesohtHUzE=
70-
gemini.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG3ghrZI2G6zc3RKzouAOdgfs6TIRpKjcUqO3pmgRFqk
71-
gemini.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDL7txJKe2OeqTWTAmuo+nUaBMvgW6NiEN5f5DB+0ZE7ilkNj8tNRV1hxQfDxndzvMe5VzT0NynLh2Zdwzf9aoqyRUGUXMQeAAjq1dDpv5dNVix6NMmsMiv565C3h5B5em6UrOSl7h8vlfXuZIsBRhWda1Gxvu1sqSoMiizwdTPOBL8KWLgkJPeS5oI16j+ssC6xh3Z6RFIaONrFMiXc5xAEHBMwZM9JDM3mPDiT7gY9IS6GKydbOa7eHw9QQaDVaBzTtaszOvMfby/dnnuF9xIhE8d9bes1MwMTd9HlwqLaWADVFlGJICYgAHe7Gz7BhhkFHMuRz9rQ5jRKztMHXXUeDpocleAe71gHr0oq4K+FlDCRnNUHICvLfRUBe7gBo1kZzzzT+pNIEJD2KH2jEMkbukxfFeQ27P3ZWaD8JIi4EfgR5QUilcGAKqXG/9/mFTR2lBhwZdYIYJicbMprqrxNe3Q/8RhxVajguO3C43mbpy2o7XSlvVSW2OUE21C2Uc=
72-
7373
# gitlab.archlinux.org
7474
[gitlab.archlinux.org]:2222 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEBI63C2m0596ZkmtvsR6IDABog4QFxrR2ZWiyR/dpJXS4YnF9+JWKD6N/3h0zLDvfjebAU3vKUpzVmoNwldTRI=
7575
[gitlab.archlinux.org]:2222 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJycPRIJd8q+ZFOcVwghbQdSfZ8i/TPoRC6JDGmNFdlI

‎group_vars/mirrors/mirrorsync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
mirrorsync_mirrors:
22
archive:
33
hosts: "{{ groups['archive_mirrors'] }}"
4-
source: rsync://{{ hostvars['gemini.archlinux.org']['wireguard_address'] }}/archive
4+
source: rsync://{{ hostvars['archive.archlinux.org']['wireguard_address'] }}/archive
55
target: /srv/archive
66
last_update_url: https://archive.archlinux.org/repos/last/lastupdate
77
last_update_dst: lastupdate

‎host_vars/gemini.archlinux.org/misc.yml renamed to ‎host_vars/archive.archlinux.org/misc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
hostname: "gemini.archlinux.org"
1+
hostname: "archive.archlinux.org"
22

33
ipv4_address: "49.12.124.107"
44
ipv4_netmask: "/32"

‎hosts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[hetzner]
2+
archive.archlinux.org
23
build.archlinux.org
3-
gemini.archlinux.org
44
gitlab.archlinux.org
5-
secure-runner1.archlinux.org
65
repos.archlinux.org
6+
secure-runner1.archlinux.org
77

88
[equinix_metal]
99
repro3.pkgbuild.com
@@ -32,10 +32,10 @@ europe.mirror.pkgbuild.com
3232

3333
[borg_clients]
3434
accounts.archlinux.org
35+
archive.archlinux.org
3536
archlinux.org
3637
aur.archlinux.org
3738
bbs.archlinux.org
38-
gemini.archlinux.org
3939
gitlab.archlinux.org
4040
homedir.archlinux.org
4141
lists.archlinux.org

‎playbooks/gemini.archlinux.org.yml renamed to ‎playbooks/archive.archlinux.org.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
- name: Setup gemini.archlinux.org
2-
hosts: gemini.archlinux.org
1+
- name: Setup archive.archlinux.org
2+
hosts: archive.archlinux.org
33
remote_user: root
44
vars_files:
55
- ../misc/vaults/vault_archive.yml

‎playbooks/tasks/include/post-upgrade/gemini.archlinux.org.yml renamed to ‎playbooks/tasks/include/post-upgrade/repos.archlinux.org.yml

File renamed without changes.

‎roles/dbscripts/templates/rsyncd.conf.proto.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ hosts deny = *
2323
path = /srv/archive
2424
comment = archive
2525
exclude = .*
26-
hosts allow = {{ hostvars['gemini.archlinux.org']['ipv4_address'] }} {{ hostvars['gemini.archlinux.org']['ipv6_address'] }}
26+
hosts allow = {{ hostvars['archive.archlinux.org']['ipv4_address'] }} {{ hostvars['archive.archlinux.org']['ipv6_address'] }}
2727

2828
# Just the release/stable iso/packages (for most mirrors)
2929
[ftp]
@@ -80,7 +80,7 @@ hosts deny = *
8080
path = /srv/ftp
8181
comment = ftp area (everything, including very old versions)
8282
exclude = /lastsync.tmp
83-
hosts allow = @@ALLOWHOSTS_TIER1@@ {{ hostvars['gemini.archlinux.org']['ipv4_address'] }} {{ hostvars['gemini.archlinux.org']['ipv6_address'] }}
83+
hosts allow = @@ALLOWHOSTS_TIER1@@ {{ hostvars['archive.archlinux.org']['ipv4_address'] }} {{ hostvars['archive.archlinux.org']['ipv6_address'] }}
8484
max connections = 0
8585

8686
[kitchensink_auth]

‎roles/prometheus_exporters/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,19 +158,19 @@
158158

159159
- name: Install rebuilderd textcollector service
160160
template: src=prometheus-archive-textcollector.service.j2 dest=/etc/systemd/system/prometheus-archive-textcollector.service owner=root group=root mode=644
161-
when: "'archive_mirrors' in group_names or inventory_hostname == 'gemini.archlinux.org'"
161+
when: "'archive_mirrors' in group_names or inventory_hostname == 'archive.archlinux.org'"
162162

163163
- name: Install rebuilderd textcollector service
164164
template: src=prometheus-repository-textcollector.service.j2 dest=/etc/systemd/system/prometheus-repository-textcollector.service owner=root group=root mode=644
165165
when: "inventory_hostname == 'repos.archlinux.org'"
166166

167167
- name: Install rebuilderd textcollector timer
168168
template: src=prometheus-archive-textcollector.timer.j2 dest=/etc/systemd/system/prometheus-archive-textcollector.timer owner=root group=root mode=644
169-
when: "'archive_mirrors' in group_names or inventory_hostname == 'gemini.archlinux.org'"
169+
when: "'archive_mirrors' in group_names or inventory_hostname == 'archive.archlinux.org'"
170170

171171
- name: Start and enable prometheus archive textcollector timer
172172
systemd_service: name=prometheus-archive-textcollector.timer enabled=yes daemon_reload=yes state=started
173-
when: "'archive_mirrors' in group_names or inventory_hostname == 'gemini.archlinux.org'"
173+
when: "'archive_mirrors' in group_names or inventory_hostname == 'archive.archlinux.org'"
174174

175175
- name: Install rebuilderd textcollector timer
176176
template: src=prometheus-repository-textcollector.timer.j2 dest=/etc/systemd/system/prometheus-repository-textcollector.timer owner=root group=root mode=644

0 commit comments

Comments
 (0)