gitlab: move gitlab to bare metal host

Signed-off-by: Leonidas Spyropoulos <artafinde@archlinux.org>

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

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)

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 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEBI63C2m0596ZkmtvsR6IDABog4QFxrR2ZWiyR/dpJXS4YnF9+JWKD6N/3h0zLDvfjebAU3vKUpzVmoNwldTRI=
+gitlab.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJycPRIJd8q+ZFOcVwghbQdSfZ8i/TPoRC6JDGmNFdlI
+gitlab.archlinux.org 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=

host_vars/gitlab.archlinux.org/misc

 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

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

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 }

tf-stage1/archlinux.tf

@@ -80,10 +80,6 @@ locals {
       server_type = "cx21"
       domain      = "debuginfod"
     }
-    "gitlab.archlinux.org" = {
-      server_type = "cpx41"
-      domain      = "gitlab"
-    }
     "gluebuddy.archlinux.org" = {
       server_type = "cx11"
       domain      = "gluebuddy"
@@ -254,13 +250,17 @@ locals {
       ipv4_address = "49.12.124.107"
       ipv6_address = "2a01:4f8:242:5614::2"
     }
+    gitlab = {
+      ipv4_address = "213.133.111.15"
+      ipv6_address = "2a01:4f8:222:174c::1"
+    }
     master-key = {
       ipv4_address = hcloud_server.machine["archlinux.org"].ipv4_address
       ipv6_address = hcloud_server.machine["archlinux.org"].ipv6_address
     }
     pages = {
-      ipv4_address = hcloud_floating_ip.gitlab_pages.ip_address
-      ipv6_address = var.gitlab_pages_ipv6
+      ipv4_address = "213.133.111.6"
+      ipv6_address = "2a01:4f8:222:174c::2"
     }
     runner1 = {
       ipv4_address = "138.199.19.15"
@@ -390,8 +390,8 @@ locals {
   #
   archlinux_page_a_aaaa = {
     "@" = {
-      ipv4_address = hcloud_floating_ip.gitlab_pages.ip_address
-      ipv6_address = var.gitlab_pages_ipv6
+      ipv4_address = "213.133.111.6"
+      ipv6_address = "2a01:4f8:222:174c::2"
     }
   }
 
@@ -589,17 +589,6 @@ resource "hetznerdns_record" "archlinux_org_origin_ns1" {
 #   type = "SOA"
 # }
 
-resource "hcloud_floating_ip" "gitlab_pages" {
-  type              = "ipv4"
-  description       = "GitLab Pages"
-  server_id         = hcloud_server.machine["gitlab.archlinux.org"].id
-  delete_protection = true
-}
-
-variable "gitlab_pages_ipv6" {
-  default = "2a01:4f8:c2c:5d2d::2"
-}
-
 resource "hcloud_volume" "mirror" {
   name              = "mirror"
   size              = 125