From d80da53615de7d6a9079a1aa977c3f7cfa3695a7 Mon Sep 17 00:00:00 2001
From: BhasherBEL <github.it@bhasher.com>
Date: Thu, 23 Feb 2023 09:22:26 +0100
Subject: [PATCH] Bxl-swarm storage, smarthome & mediaserver

---
 bxl-swarm/mediaserver.stack.yaml | 12 ++++++++++--
 bxl-swarm/smarthome.stack.yaml   |  4 ++++
 bxl-swarm/storage.stack.yaml     |  6 ++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/bxl-swarm/mediaserver.stack.yaml b/bxl-swarm/mediaserver.stack.yaml
index 53daff7..7fbe730 100644
--- a/bxl-swarm/mediaserver.stack.yaml
+++ b/bxl-swarm/mediaserver.stack.yaml
@@ -59,9 +59,11 @@ services:
     networks:
     - internal
     - external
+    - storage
     depends_on:
     - system_traefik
     - system_nfs
+    - storage_postgres
 
   sonarr:
     image: lscr.io/linuxserver/sonarr:latest
@@ -97,7 +99,7 @@ services:
     - system_nfs
 
   lidarr:
-    image: lscr.io/linuxserver/lidarr:latest
+    image: lscr.io/linuxserver/lidarr:1.1.2-develop  # required for postgres
     environment:
       - PUID=1000
       - PGID=1000
@@ -125,9 +127,11 @@ services:
     networks:
     - internal
     - external
+    - storage
     depends_on:
     - system_traefik
     - system_nfs
+    - storage_postgres
 
   transmission:
     image: lscr.io/linuxserver/transmission:latest
@@ -219,7 +223,7 @@ services:
         - node.labels.POWER == true
 
   bazarr:
-    image: lscr.io/linuxserver/bazarr:latest
+    image: lscr.io/linuxserver/bazarr:1.1.5-development  # required for postgres
     environment:
       - TZ=Europe/Paris
     volumes:
@@ -245,13 +249,17 @@ services:
     networks:
     - external
     - internal
+    - storage
     depends_on:
     - system_traefik
     - system_nfs
+    - storage_postgres
  
 
 
 networks:
   internal:
+  storage:
+    external: true
   external:
     external: true
diff --git a/bxl-swarm/smarthome.stack.yaml b/bxl-swarm/smarthome.stack.yaml
index 677daec..370d73e 100644
--- a/bxl-swarm/smarthome.stack.yaml
+++ b/bxl-swarm/smarthome.stack.yaml
@@ -6,6 +6,7 @@ services:
     - /mnt/nfs/hass:/config
     - /etc/localtime:/etc/localtime:ro
     networks:
+    - storage
     - smarthome
     - external
     deploy:
@@ -27,6 +28,7 @@ services:
     depends_on:
     - system_traefik
     - system_nfs
+    - storage_postgres
 
   mosquitto:
     image: eclipse-mosquitto:latest
@@ -53,5 +55,7 @@ services:
 
 networks:
   smarthome:
+  storage:
+    external: true
   external:
     external: true
diff --git a/bxl-swarm/storage.stack.yaml b/bxl-swarm/storage.stack.yaml
index 2905cf8..1d69275 100644
--- a/bxl-swarm/storage.stack.yaml
+++ b/bxl-swarm/storage.stack.yaml
@@ -7,7 +7,7 @@ services:
     - POSTGRES_USER=postgres
     - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
     volumes:
-    - /mnt/nfs/postgres:/var/lib/postgresql/data
+    - /mnt/Main/redondant/shared/postgres:/var/lib/postgresql/data
     networks:
     - storage
     secrets:
@@ -20,9 +20,7 @@ services:
         max_attempts: 3
       placement:
         constraints:
-        - node.labels.POWER == true
-    depends_on:
-    - system_nfs
+        - node.labels.STORAGE == true
 
   redis:
     image: redis:latest