Remove app02

host_vars/sapt-labp-app01.yml

@@ -4,10 +4,3 @@
 fqdn: sapt-labp-app01.prod.servers.sapti.me
 ansible_host: 192.168.17.30
 internal_ipv4: 10.2.16.10
-
-apps_include:
-  - nginx
-  - postfix
-  - nextcloud
-  - restic
-  - watchtower

host_vars/sapt-labp-app02.yml

@@ -1,13 +0,0 @@
-# vim: ft=yaml.ansible
-# code: language=ansible
----
-fqdn: sapt-labp-app02.prod.servers.sapti.me
-ansible_host: 192.168.17.31
-internal_ipv4: 10.2.16.11
-
-apps_include:
-  - nginx
-  - ipfs
-  - monerod
-  - snowflake
-  - watchtower

host_vars/sapt-labs-app01.yml

@@ -4,10 +4,3 @@
 fqdn: sapt-labs-app01.stage.servers.sapti.me
 ansible_host: 192.168.17.50
 internal_ipv4: 10.2.19.10
-
-apps_include:
-  - nginx
-  - postfix
-  - nextcloud
-  - restic
-  - watchtower

host_vars/sapt-labs-app02.yml

@@ -1,13 +0,0 @@
-# vim: ft=yaml.ansible
-# code: language=ansible
----
-fqdn: sapt-labs-app02.stage.servers.sapti.me
-ansible_host: 192.168.17.51
-internal_ipv4: 10.2.19.11
-
-apps_include:
-  - nginx
-  - ipfs
-  - monerod
-  - snowflake
-  - watchtower

inventory.ini

@@ -1,13 +1,11 @@
 [app_prod]
 sapt-labp-app01
-sapt-labp-app02
 
 [db_prod]
 sapt-labp-db01
 
 [app_stage]
 sapt-labs-app01
-sapt-labs-app02
 
 [db_stage]
 sapt-labs-db01

roles/proxy/defaults/main.yml

@@ -7,9 +7,7 @@ proxy_caddy_version: '2.7.4'
 proxy_vars:
   production:
     app01: "{{ hostvars['sapt-labp-app01'] }}"
-    app02: "{{ hostvars['sapt-labp-app02'] }}"
   staging:
     app01: "{{ hostvars['sapt-labs-app01'] }}"
-    app02: "{{ hostvars['sapt-labs-app02'] }}"
   shared:
     mon01: "{{ hostvars['sapt-labr-mon01'] }}"

roles/proxy/templates/caddy/global.Caddyfile.j2

@@ -17,9 +17,9 @@
     reverse_proxy {{ proxy_vars[env].app01.internal_ipv4 }}:8080
 }
 
-{{ proxy_vars[env].app02.apps_vars.ipfs.gateway_domain }},
-*.ipfs.{{ proxy_vars[env].app02.apps_vars.ipfs.gateway_domain }},
-*.ipns.{{ proxy_vars[env].app02.apps_vars.ipfs.gateway_domain }} {
+{{ proxy_vars[env].app01.apps_vars.ipfs.gateway_domain }},
+*.ipfs.{{ proxy_vars[env].app01.apps_vars.ipfs.gateway_domain }},
+*.ipns.{{ proxy_vars[env].app01.apps_vars.ipfs.gateway_domain }} {
     tls {{ tls_email }} {
         dns njalla {{ njalla_api_token }}
     }
@@ -29,6 +29,6 @@
         -Server
     }
 
-    reverse_proxy {{ proxy_vars[env].app02.internal_ipv4 }}:8080
+    reverse_proxy {{ proxy_vars[env].app01.internal_ipv4 }}:8080
 }
 {% endfor %}

roles/proxy/templates/caddy/local.Caddyfile.j2

@@ -6,7 +6,7 @@
 
 # Environment: {{ env }}
 
-{{ proxy_vars[env].app02.apps_vars.ipfs.domain }} {
+{{ proxy_vars[env].app01.apps_vars.ipfs.domain }} {
     tls {{ tls_email }} {
         dns njalla {{ njalla_api_token }}
     }
@@ -16,10 +16,10 @@
         -Server
     }
 
-    reverse_proxy {{ proxy_vars[env].app02.internal_ipv4 }}:8080
+    reverse_proxy {{ proxy_vars[env].app01.internal_ipv4 }}:8080
 }
 
-{{ proxy_vars[env].app02.apps_vars.monerod.domain }} {
+{{ proxy_vars[env].app01.apps_vars.monerod.domain }} {
     tls {{ tls_email }} {
         dns njalla {{ njalla_api_token }}
     }
@@ -29,6 +29,6 @@
         -Server
     }
 
-    reverse_proxy {{ proxy_vars[env].app02.internal_ipv4 }}:8080
+    reverse_proxy {{ proxy_vars[env].app01.internal_ipv4 }}:8080
 }
 {% endfor %}