From 71d8edab0ac6df3ebb5a6f29dee66c580cb9b070 Mon Sep 17 00:00:00 2001
From: Nick Stokoe <git.wu-lee@noodlefactory.co.uk>
Date: Fri, 3 Dec 2021 17:38:49 +0000
Subject: [PATCH] snackpot.yml, docker-compose.yml - these nextcloud paths can
 be fixed

---
 snackpot.yml                                |  3 ---
 templates/docker-compose/docker-compose.yml | 10 +++++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/snackpot.yml b/snackpot.yml
index 84fc7be..0c62a31 100644
--- a/snackpot.yml
+++ b/snackpot.yml
@@ -6,9 +6,6 @@
     postgres_password: "{{lookup('passwordstore', 'servers/snackpot/postgres_db.password')}}"
     postgres_db_user: postgres
     nextcloud_hostname: nc.noodlefactory.co.uk
-    nextcloud_base_dir: /var/www/html
-    nextcloud_data_dir: /var/www/data
-    nextcloud_ext_dir: /var/www/ext
     nextcloud_db_user: nextcloud
     nextcloud_db: nextcloud
     letsencrypt_email: webmaster@noodlefactory.co.uk
diff --git a/templates/docker-compose/docker-compose.yml b/templates/docker-compose/docker-compose.yml
index 5f28245..2ab7eca 100644
--- a/templates/docker-compose/docker-compose.yml
+++ b/templates/docker-compose/docker-compose.yml
@@ -42,9 +42,9 @@ services:
     image: nextcloud:18.0.13-fpm-alpine
     restart: always
     volumes:
-      - nextcloud_src:{{ nextcloud_base_dir }}
-      - nextcloud_data:{{ nextcloud_data_dir }}
-      - minidlna_data:{{ nextcloud_ext_dir }}/media
+      - nextcloud_src:/var/www/html
+      - nextcloud_data:/var/www/data
+      - minidlna_data:/var/www/ext/media
       - /srv:/srv
     links:
       - postgres
@@ -62,8 +62,8 @@ services:
     image: nextcloud:18.0.13-fpm-alpine
     restart: always
     volumes:
-      - nextcloud_src:{{ nextcloud_base_dir }}
-      - nextcloud_data:{{ nextcloud_data_dir }}
+      - nextcloud_src:/var/www/html
+      - nextcloud_data:/var/www/data
     entrypoint: /cron.sh
     depends_on:
       - postgres