Remove deployments on turing

Files of the webserver have been migrated over.
python-discord · Jul 22, 2024 · 2be26a4 · 2be26a4
1 parent c10285a
commit 2be26a4
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 52 deletions.
diff --git a/ansible/host_vars/lovelace/nginx.yml b/ansible/host_vars/lovelace/nginx.yml
@@ -24,3 +24,14 @@ nginx_configs:
       CN=sudo.access.tls.pydis.wtf 0;
       CN=prometheus.access.tls.pydis.wtf 0;
     }
+
+  files.pydis.wtf.conf: |
+    server {
+      listen      443;
+      server_name files.pydis.wtf cloud.native.is.fun.and.easy.pydis.wtf;
+      root        /var/www/files.pydis.wtf;
+
+      location / {
+        try_files $uri $uri/ =404;
+      }
+    }
diff --git a/ansible/host_vars/lovelace/prometheus.yml b/ansible/host_vars/lovelace/prometheus.yml
@@ -63,7 +63,6 @@ prometheus_configuration: |
       static_configs:
         - targets:
             - lovelace.box.pydis.wtf
-            - turing.box.pydis.wtf
 
       relabel_configs:
         # Ensure that the SSH port is included explicitly

diff --git a/ansible/host_vars/turing/nginx.yml b/ansible/host_vars/turing/nginx.yml
diff --git a/ansible/inventory/hosts.yaml b/ansible/inventory/hosts.yaml
@@ -1,8 +1,5 @@
 all:
   hosts:
-    turing:
-      ansible_host: turing.box.pydis.wtf
-      wireguard_subnet: 10.1.0.0/16
     lovelace:
       ansible_host: lovelace.box.pydis.wtf
       wireguard_subnet: 10.2.0.0/16
@@ -15,7 +12,6 @@ all:
         lovelace:
     nginx:
       hosts:
-        turing:
         lovelace:
     databases:
       hosts:

diff --git a/ansible/local_testing/README.md b/ansible/local_testing/README.md
@@ -55,7 +55,6 @@ vms:
 - lovelace: 192.168.56.3
 - neumann: 192.168.56.4
 - richie: 192.168.56.5
-- turing: 192.168.56.6
 ```
 
 

diff --git a/ansible/local_testing/Vagrantfile b/ansible/local_testing/Vagrantfile
@@ -82,16 +82,4 @@ Vagrant.configure("2") do |config|
           v.memory = 2048
         end
     end
-
-    config.vm.define "turing" do |turing|
-        turing.vm.hostname = "turing"
-        turing.vm.network "private_network", ip: "192.168.56.6",
-            virtualbox__intnet: true
-        turing.vm.synced_folder '.', '/vagrant', disabled: true
-
-        turing.vm.provider "virtualbox" do |v|
-          v.name = "pydis_turing"
-          v.memory = 2048
-        end
-    end
 end
diff --git a/ansible/local_testing/hosts.yaml b/ansible/local_testing/hosts.yaml
@@ -16,14 +16,10 @@ all:
       ansible_host: 192.168.56.5
       ip: 192.168.56.5
       access_ip: 192.168.56.5
-    turing:
-      ansible_host: 192.168.56.6
-      ip: 192.168.56.6
-      access_ip: 192.168.56.6
   children:
     nginx:
       hosts:
-        turing:
+        lovelace:
     databases:
       hosts:
         lovelace:
diff --git a/ansible/roles/certbot/vars/main/main.yml b/ansible/roles/certbot/vars/main/main.yml
@@ -4,7 +4,6 @@ certbot_email: "[email protected]"
 certbot_domains:
   lovelace:
     - prometheus.lovelace.box.pydis.wtf
-  turing:
     - pydis.wtf
     - "*.pydis.wtf"
     - cloud.native.is.fun.and.easy.pydis.wtf

diff --git a/dns/zones/pydis.wtf.yaml b/dns/zones/pydis.wtf.yaml
@@ -81,7 +81,7 @@ files:
       proxied: true
   ttl: 300
   type: A
-  value: 89.58.25.151
+  value: 89.58.26.118
 
 grafana:
   octodns:
@@ -209,20 +209,6 @@ prometheus.lovelace.box:
     type: AAAA
     value: 2a03:4000:62:ce0:2496:aeff:fe97:dea4
 
-turing.box:
-  - octodns:
-      cloudflare:
-        auto-ttl: true
-    ttl: 300
-    type: A
-    value: 89.58.25.151
-  - octodns:
-      cloudflare:
-        auto-ttl: true
-    ttl: 300
-    type: AAAA
-    value: 2a03:4000:62:ce1:943b:b2ff:fef4:d3b7
-
 vault:
   octodns:
     cloudflare: