void-linux · classabbyamp · Jul 15, 2024 · Jul 15, 2024 · Jul 15, 2024 · Jul 15, 2024
diff --git a/.gitmodules b/.gitmodules
@@ -1,15 +1,9 @@
-[submodule "roles/nginx"]
-	path = ansible/roles/nginx
-	url = [email protected]:void-ansible-roles/nginx.git
 [submodule "roles/sshd"]
 	path = ansible/roles/sshd
 	url = [email protected]:void-ansible-roles/sshd.git
 [submodule "roles/xbps-repoconf"]
 	path = ansible/roles/xbps-repoconf
 	url = [email protected]:void-ansible-roles/xbps-repoconf.git
-[submodule "roles/acmetool"]
-	path = ansible/roles/acmetool
-	url = [email protected]:void-ansible-roles/acmetool.git
 [submodule "roles/mosh"]
 	path = ansible/roles/mosh
 	url = [email protected]:void-ansible-roles/mosh.git

diff --git a/ansible/build.yml b/ansible/build.yml
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
@@ -26,5 +26,3 @@ network_forward_policy: ACCEPT
 
 network_static_dns_resolvers:
   - 127.0.0.1
-
-nginx_bind_443: "{{void_aquire_certs}}"
diff --git a/ansible/group_vars/build.yml b/ansible/group_vars/build.yml
diff --git a/ansible/group_vars/buildmaster.yml b/ansible/group_vars/buildmaster.yml
diff --git a/ansible/group_vars/prod.yml b/ansible/group_vars/prod.yml
@@ -1,11 +1,7 @@
 ---
-void_aquire_certs: true
-
 sshd_passwords: false
 sshd_challengeresponse: false
 
-nginx_acme_challenge_path: /var/run/acme/acme-challenge/
-
 void_mesh:
   a-hel-fi.m.voidlinux.org: 192.168.99.100
   b-lej-de.m.voidlinux.org: 192.168.99.101

diff --git a/ansible/host_vars/a-fsn-de.m.voidlinux.org.yml b/ansible/host_vars/a-fsn-de.m.voidlinux.org.yml
@@ -19,9 +19,6 @@ xbps_repository_multilib_nonfree: /data/pkgs/multilib/nonfree
 
 sshd_AllowGroups:
   - build-ops
-  - void-buildsync
-
-buildslave_zone: DE-1
 
 nomad_host_volumes:
   - name: void-packages

diff --git a/ansible/host_vars/a-hel-fi.m.voidlinux.org.yml b/ansible/host_vars/a-hel-fi.m.voidlinux.org.yml
@@ -14,30 +14,6 @@ network_static_interfaces:
 
 sshd_AllowGroups:
   - build-ops
-  - syncpeers
-
-nginx_dhparam_bits: 2048
-
-buildmaster_ssl_cert_path: /var/lib/acme/live/build.voidlinux.org/fullchain
-buildmaster_ssl_certkey_path: /var/lib/acme/live/build.voidlinux.org/privkey
-
-buildslave_zone: FI-1
-buildslave_master: localhost
-
-buildslave_groups:
-  - xbuilder
-  - void-repo
-
-buildslave_hostdir_group: void-repo
-
-acmetool:
-  sites:
-    - site: build.voidlinux.org
-      names:
-        - build.voidlinux.org
-  hostmaster_email: [email protected]
-  services:
-    - nginx
 
 nomad_host_volumes:
   - name: terrastate
@@ -52,7 +28,3 @@ nomad_host_volumes:
   - name: ccache
     path: /hostdir/ccache
     read_only: true
-
-nomad_reserved_ports:
-  - 80  # Legacy nginx on this host
-  - 443 # Legacy nginx on this host
diff --git a/ansible/host_vars/b-fsn-de.m.voidlinux.org.yml b/ansible/host_vars/b-fsn-de.m.voidlinux.org.yml
@@ -1,9 +1,6 @@
 ---
 sshd_AllowGroups:
   - build-ops
-  - void-buildsync
-
-buildslave_zone: DE-2
 
 nomad_host_volumes:
   - name: ccache

diff --git a/ansible/inventory b/ansible/inventory
@@ -1,15 +1,3 @@
-[buildmaster]
-a-hel-fi.m.voidlinux.org
-
-[buildslave]
-a-hel-fi.m.voidlinux.org
-a-fsn-de.m.voidlinux.org
-b-fsn-de.m.voidlinux.org
-
-[build:children]
-buildmaster
-buildslave
-
 [buildworker]
 a-hel-fi.m.voidlinux.org
 a-fsn-de.m.voidlinux.org

diff --git a/ansible/roles/acmetool b/ansible/roles/acmetool
diff --git a/ansible/roles/buildmaster/defaults/main.yml b/ansible/roles/buildmaster/defaults/main.yml
diff --git a/ansible/roles/buildmaster/files/ShellCommandChangeList.py b/ansible/roles/buildmaster/files/ShellCommandChangeList.py
diff --git a/ansible/roles/buildmaster/files/__init__.py b/ansible/roles/buildmaster/files/__init__.py
diff --git a/ansible/roles/buildmaster/files/buildmaster.6rules b/ansible/roles/buildmaster/files/buildmaster.6rules
diff --git a/ansible/roles/buildmaster/files/buildmaster.rules b/ansible/roles/buildmaster/files/buildmaster.rules
diff --git a/ansible/roles/buildmaster/files/buildmaster_root.conf b/ansible/roles/buildmaster/files/buildmaster_root.conf
diff --git a/ansible/roles/buildmaster/files/state.sqlite b/ansible/roles/buildmaster/files/state.sqlite
diff --git a/ansible/roles/buildmaster/files/terse-irc.patch b/ansible/roles/buildmaster/files/terse-irc.patch
diff --git a/ansible/roles/buildmaster/meta/main.yml b/ansible/roles/buildmaster/meta/main.yml