From c6f0e1f7014f2f12e119df4849eaa904749b3651 Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Wed, 28 Dec 2022 18:24:27 +0100
Subject: [PATCH] Fix container communication

---
 roles/docker/tasks/services/caddy.yml     | 4 ++++
 roles/docker/tasks/services/emby.yml      | 2 ++
 roles/docker/tasks/services/monerod.yml   | 2 ++
 roles/docker/tasks/services/nextcloud.yml | 6 ++++--
 roles/docker/tasks/services/wireguard.yml | 2 +-
 roles/docker/templates/Caddyfile.j2       | 6 +++---
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/roles/docker/tasks/services/caddy.yml b/roles/docker/tasks/services/caddy.yml
index 769c1f5..5b64bfb 100644
--- a/roles/docker/tasks/services/caddy.yml
+++ b/roles/docker/tasks/services/caddy.yml
@@ -26,6 +26,10 @@
     restart_policy: unless-stopped
     networks:
       - name: services
+        ipv4_address: 172.16.0.2
+    published_ports:
+      - '80:80/tcp'
+      - '443:443/tcp'
     volumes:
       - "{{ services.caddy.volume }}/Caddyfile:/etc/caddy/Caddyfile:ro"
       - "{{ services.caddy.volume }}/config:/config:rw"
diff --git a/roles/docker/tasks/services/emby.yml b/roles/docker/tasks/services/emby.yml
index 8ba8a82..a3c2eb0 100644
--- a/roles/docker/tasks/services/emby.yml
+++ b/roles/docker/tasks/services/emby.yml
@@ -23,6 +23,8 @@
       GID: '1000'
     networks:
       - name: services
+        aliases:
+          - emby
     volumes:
       - "{{ services.emby.volume }}/programdata:/config:rw"
       - "{{ services.emby.volume }}/tvshows:/mnt/share1:rw"
diff --git a/roles/docker/tasks/services/monerod.yml b/roles/docker/tasks/services/monerod.yml
index acae598..f6fcad7 100644
--- a/roles/docker/tasks/services/monerod.yml
+++ b/roles/docker/tasks/services/monerod.yml
@@ -12,6 +12,8 @@
     restart_policy: unless-stopped
     networks:
       - name: services
+        aliases:
+          - monerod
     volumes:
       - monerod-node-blockchain:/home/monero/.bitmonero:rw
     published_ports:
diff --git a/roles/docker/tasks/services/nextcloud.yml b/roles/docker/tasks/services/nextcloud.yml
index bc54a79..432413f 100644
--- a/roles/docker/tasks/services/nextcloud.yml
+++ b/roles/docker/tasks/services/nextcloud.yml
@@ -75,8 +75,10 @@
             PHP_MEMORY_LIMIT: 2G
             PHP_UPLOAD_LIMIT: 16G
           networks:
-            - default
-            - services
+            default:
+            services:
+              aliases:
+                - nextcloud
           volumes:
             - "{{ services.nextcloud.volume }}/app:/var/www/html:rw"
             - "{{ services.nextcloud.volume }}/apache2/apache2.conf:/etc/apache2/apache2.conf:ro"
diff --git a/roles/docker/tasks/services/wireguard.yml b/roles/docker/tasks/services/wireguard.yml
index 3d00cc5..f6266af 100644
--- a/roles/docker/tasks/services/wireguard.yml
+++ b/roles/docker/tasks/services/wireguard.yml
@@ -14,7 +14,7 @@
     restart_policy: unless-stopped
     env:
       SERVERURL: "{{ services.wireguard.domain }}"
-      SERVERPORT: 51820
+      SERVERPORT: '51820'
       PEERS: "{{ secrets.wireguard.peers }}"
       PEERDNS: auto
       TZ: "{{ timezone }}"
diff --git a/roles/docker/templates/Caddyfile.j2 b/roles/docker/templates/Caddyfile.j2
index db529c4..4931460 100644
--- a/roles/docker/templates/Caddyfile.j2
+++ b/roles/docker/templates/Caddyfile.j2
@@ -13,7 +13,7 @@
         -Server
     }
 
-    reverse_proxy nextcloud_app_1:80
+    reverse_proxy nextcloud:80
 }
 
 {{ services.emby.domain }} {
@@ -24,7 +24,7 @@
         -Server
     }
 
-    reverse_proxy emby_app:8096
+    reverse_proxy emby:8096
 }
 
 {{ services.monerod.domain }}:18089 {
@@ -35,5 +35,5 @@
         -Server
     }
 
-    reverse_proxy monerod_node:18089
+    reverse_proxy monerod:18089
 }