From 59bca9ce9e3cf85a21a8ec894f9c6ffadcb71616 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Wed, 27 Nov 2024 03:02:59 +0100
Subject: [PATCH] Normalize the save path of service data

---
 .../docker/services/nextcloud/docker-compose.base.yml  |  8 ++++----
 .../docker/services/nextcloud/docker-compose.core.yml  | 10 +++++-----
 .../docker/services/teamspeak/docker-compose.base.yml  |  2 +-
 .../services/vaultwarden/docker-compose.base.yml       |  2 +-
 .../docker/services/wekan/docker-compose.base.yml      |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/Common/Software/docker/services/nextcloud/docker-compose.base.yml b/scripts/Common/Software/docker/services/nextcloud/docker-compose.base.yml
index 5d02db25..468fa889 100644
--- a/scripts/Common/Software/docker/services/nextcloud/docker-compose.base.yml
+++ b/scripts/Common/Software/docker/services/nextcloud/docker-compose.base.yml
@@ -6,7 +6,7 @@ services:
       service: web
     volumes:
       - ./nginx/web.conf:/etc/nginx/nginx.conf
-      - ./cloud/logs/nginx:/var/log/nginx
+      - ./nginx/logs/nginx:/var/log/nginx
     depends_on:
       core:
         condition: service_healthy
@@ -28,7 +28,7 @@ services:
       MARIADB_RANDOM_ROOT_PASSWORD: "yes"
       MARIADB_MYSQL_LOCALHOST_USER: 1
     volumes:
-      - ./cloud/database:/var/lib/mysql
+      - ./data/db:/var/lib/mysql
     command:
       - --innodb_read_only_compressed=OFF
     healthcheck:
@@ -46,7 +46,7 @@ services:
     env_file:
       - cache.env
     volumes:
-      - ./cloud/cache:/data
+      - ./data/cache:/data
     healthcheck:
       test: [CMD, bash, -c, echo '' > /dev/tcp/127.0.0.1/6379]
       interval: 5s
@@ -88,7 +88,7 @@ services:
     image: shenxn/protonmail-bridge
     restart: unless-stopped
     volumes:
-      - ./bridge:/root
+      - ./data/bridge:/root
   turn:
     image: instrumentisto/coturn
     restart: unless-stopped
diff --git a/scripts/Common/Software/docker/services/nextcloud/docker-compose.core.yml b/scripts/Common/Software/docker/services/nextcloud/docker-compose.core.yml
index be8534ed..89490228 100644
--- a/scripts/Common/Software/docker/services/nextcloud/docker-compose.core.yml
+++ b/scripts/Common/Software/docker/services/nextcloud/docker-compose.core.yml
@@ -4,11 +4,11 @@ services:
     volumes:
       - webroot:/var/www/html:z
       - ./php.ini:/usr/local/etc/php/conf.d/nextcloud.ini
-      - ./cloud/apps:/var/www/html/custom_apps
-      - ./cloud/config:/var/www/html/config
-      - ./cloud/data:/var/www/html/data
-      - ./cloud/themes:/var/www/html/themes
-      - ./cloud/public:/public
+      - ./data/cloud/apps:/var/www/html/custom_apps
+      - ./data/cloud/config:/var/www/html/config
+      - ./data/cloud/data:/var/www/html/data
+      - ./data/cloud/themes:/var/www/html/themes
+      - ./data/public:/public
       - ../jellyfin/downloads:/downloads
   setup:
     extends:
diff --git a/scripts/Common/Software/docker/services/teamspeak/docker-compose.base.yml b/scripts/Common/Software/docker/services/teamspeak/docker-compose.base.yml
index 427ea630..7ff9d90e 100644
--- a/scripts/Common/Software/docker/services/teamspeak/docker-compose.base.yml
+++ b/scripts/Common/Software/docker/services/teamspeak/docker-compose.base.yml
@@ -18,4 +18,4 @@ services:
     environment:
       MARIADB_RANDOM_ROOT_PASSWORD: "yes"
     volumes:
-      - ./database:/var/lib/mysql
+      - ./data/db:/var/lib/mysql
diff --git a/scripts/Common/Software/docker/services/vaultwarden/docker-compose.base.yml b/scripts/Common/Software/docker/services/vaultwarden/docker-compose.base.yml
index e8059cab..2e99cdd4 100644
--- a/scripts/Common/Software/docker/services/vaultwarden/docker-compose.base.yml
+++ b/scripts/Common/Software/docker/services/vaultwarden/docker-compose.base.yml
@@ -25,4 +25,4 @@ services:
     image: shenxn/protonmail-bridge
     restart: unless-stopped
     volumes:
-      - ./bridge:/root
+      - ./data/bridge:/root
diff --git a/scripts/Common/Software/docker/services/wekan/docker-compose.base.yml b/scripts/Common/Software/docker/services/wekan/docker-compose.base.yml
index 6c2659a9..9f645a33 100644
--- a/scripts/Common/Software/docker/services/wekan/docker-compose.base.yml
+++ b/scripts/Common/Software/docker/services/wekan/docker-compose.base.yml
@@ -21,7 +21,7 @@ services:
     command: mongod --logpath /dev/null --oplogSize 128 --quiet
     volumes:
       - /etc/localtime:/etc/localtime:ro
-      - ./data/database:/data/db
+      - ./data/db:/data/db
   bridge:
     image: shenxn/protonmail-bridge
     restart: unless-stopped