group_vars/appservers/vars.yml

@@ -1,6 +1,18 @@
 # vim: ft=yaml.ansible
 # code: language=ansible
 ---
+apps_include:
+  - nginx
+  - postfix
+  - ipfs
+  - jitsi
+  - joplin
+  - monerod
+  - nextcloud
+  - snowflake
+  - restic
+  - watchtower
+
 jitsi_passwords:
   jicofo_auth: "{{ vault_jitsi_passwords.jicofo_auth }}"
   jvb_auth: "{{ vault_jitsi_passwords.jvb_auth }}"

group_vars/mcservers/vars.yml

@@ -4,3 +4,5 @@
 apps_include:
   - minecraft
   - watchtower
+
+apps_create_shared_docker_network: false

group_vars/production/vars.yml

@@ -1,18 +1,6 @@
 # vim: ft=yaml.ansible
 # code: language=ansible
 ---
-apps_include:
-  - nginx
-  - postfix
-  - ipfs
-  - jitsi
-  - joplin
-  - monerod
-  - nextcloud
-  - snowflake
-  - restic
-  - watchtower
-
 base_domain: sapti.me
 internal_subnet: 10.2.16.0/24
 postgresql_version: 14

group_vars/staging/vars.yml

@@ -1,17 +1,6 @@
 # vim: ft=yaml.ansible
 # code: language=ansible
 ---
-apps_include:
-  - nginx
-  - postfix
-  - ipfs
-  - jitsi
-  - joplin
-  - nextcloud
-  - snowflake
-  - restic
-  - watchtower
-
 base_domain: staging.sapti.me
 internal_subnet: 10.2.19.0/24
 postgresql_version: 14

roles/apps/defaults/main.yml

@@ -79,7 +79,7 @@ apps_vars:
     extra_tasks: true
     domain: cloud.{{ apps_base_domain }}
     port: 80
-    version: 29.0.6-apache
+    version: 29.0.4-apache
     redis_version: 7-alpine
 
   searxng:
@@ -124,8 +124,7 @@ apps_vars:
     extra_tasks: false
     version: '1.7.1'
 
-apps_exclude: []
+apps_include: "{{ apps_vars | dict2items | map(attribute='key') | list }}"
-apps_include: "{{ apps_vars | dict2items | map(attribute='key') | list | difference(apps_exclude) }}"
 apps_backup: "{{ apps_vars | dict2items | selectattr('value.backup', 'true') | map(attribute='key') | list | intersect(apps_include) }}"
 apps_proxied: "{{ apps_vars | dict2items | selectattr('value.domain', 'defined') | map(attribute='key') | list | intersect(apps_include) }}"
 apps_torified: "{{ apps_vars | dict2items | selectattr('value.onion', 'defined') | map(attribute='key') | list | intersect(apps_include) }}"

roles/apps/tasks/main.yml

@@ -8,7 +8,7 @@
     ipam_config:
       - subnet: 172.17.2.0/24
       - subnet: fd02::/64
-    state: "{{ 'present' if 'caddy' in apps_include or 'nginx' in apps_include else 'absent' }}"
+    state: "{{ 'present' if apps_create_shared_docker_network is undefined or apps_create_shared_docker_network else 'absent' }}"
 
 - name: Create Docker network for Postfix
   community.docker.docker_network:

roles/proxy/templates/caddy/Caddyfile.j2

@@ -3,7 +3,6 @@
 
 {% for env in proxy_environments %}
 # BEGIN Environment: {{ env }}
-{% if 'nextcloud' in proxy_vars[env].app01.apps_include %}
 
 cloud.{{ proxy_vars[env].app01.base_domain }} {
     tls {{ tls_email }} {
@@ -29,8 +28,6 @@ cloud.{{ proxy_vars[env].app01.base_domain }} {
     respond 403
 {% endif %}
 }
-{% endif %}
-{% if 'ipfs' in proxy_vars[env].app01.apps_include %}
 
 ipfs-gateway.{{ proxy_vars[env].app01.base_domain }},
 *.ipfs.ipfs-gateway.{{ proxy_vars[env].app01.base_domain }},
@@ -79,8 +76,6 @@ ipfs.local.{{ proxy_vars[env].app01.base_domain }} {
 
     respond 403
 }
-{% endif %}
-{% if 'joplin' in proxy_vars[env].app01.apps_include %}
 
 joplin.{{ proxy_vars[env].app01.base_domain }} {
     tls {{ tls_email }} {
@@ -106,8 +101,6 @@ joplin.{{ proxy_vars[env].app01.base_domain }} {
     respond 403
 {% endif %}
 }
-{% endif %}
-{% if 'jitsi' in proxy_vars[env].app01.apps_include %}
 
 meet.{{ proxy_vars[env].app01.base_domain }} {
     tls {{ tls_email }} {
@@ -133,8 +126,6 @@ meet.{{ proxy_vars[env].app01.base_domain }} {
     respond 403
 {% endif %}
 }
-{% endif %}
-{% if 'monerod' in proxy_vars[env].app01.apps_include %}
 
 xmr.local.{{ proxy_vars[env].app01.base_domain }} {
     tls {{ tls_email }} {
@@ -156,7 +147,6 @@ xmr.local.{{ proxy_vars[env].app01.base_domain }} {
 
     respond 403
 }
-{% endif %}
 
 # END Environment: {{ env }}
 {% endfor %}