From efa7ddb947baf14e4a565af3fba1fa5bea77d314 Mon Sep 17 00:00:00 2001
From: jaydee <jaydee@sectorq.eu>
Date: Fri, 7 Mar 2025 22:28:21 +0100
Subject: [PATCH] lala

---
 nextcloud/.env                  |  2 ++
 nextcloud/.env/db_password      |  1 -
 nextcloud/.env/db_root_password |  1 -
 nextcloud/docker-compose.yml    | 30 +++++++++---------------------
 nextcloud/stack.env             | 10 ++++++++++
 5 files changed, 21 insertions(+), 23 deletions(-)
 create mode 100644 nextcloud/.env
 delete mode 100644 nextcloud/.env/db_password
 delete mode 100644 nextcloud/.env/db_root_password
 create mode 100644 nextcloud/stack.env

diff --git a/nextcloud/.env b/nextcloud/.env
new file mode 100644
index 0000000..164ccbb
--- /dev/null
+++ b/nextcloud/.env
@@ -0,0 +1,2 @@
+APPNAME=nextcloud
+DOCKER_REGISTRY=r.sectorq.eu/library/
\ No newline at end of file
diff --git a/nextcloud/.env/db_password b/nextcloud/.env/db_password
deleted file mode 100644
index 2adc89a..0000000
--- a/nextcloud/.env/db_password
+++ /dev/null
@@ -1 +0,0 @@
-l4c1j4yd33Du5lo
\ No newline at end of file
diff --git a/nextcloud/.env/db_root_password b/nextcloud/.env/db_root_password
deleted file mode 100644
index 2adc89a..0000000
--- a/nextcloud/.env/db_root_password
+++ /dev/null
@@ -1 +0,0 @@
-l4c1j4yd33Du5lo
\ No newline at end of file
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index c9a3a97..9c2e47b 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -14,22 +14,17 @@ services:
     volumes:
       - /share/docker_data/nextcloud/mariadb:/var/lib/mysql
       - /etc/localtime:/etc/localtime
-    environment:
-      - TZ=Europe/Bratislava
-      - MYSQL_ROOT_PASSWORD=l4c1j4yd33Du5lo
-      - MYSQL_PASSWORD=l4c1j4yd33Du5lo
-      - MYSQL_DATABASE=nextcloud
-      - MYSQL_USER=nextcloud
+    env_file:
+      - stack.env
     networks:
       - nextcloud_network
     labels:
       com.centurylinklabs.watchtower.enable: true
-    restart: unless-stopped
+    restart: ${RESTART:-unless-stopped}
   app:
     image: ${DOCKER_REGISTRY:-}nextcloud:latest
     ports:
       - 8134:80
-
     links:
       - db
     volumes:
@@ -39,16 +34,9 @@ services:
       - /share/docker_data/nextcloud/app-hooks/pre-upgrade:/docker-entrypoint-hooks.d/pre-upgrade
       - /share/docker_data/nextcloud/app-hooks/post-upgrade:/docker-entrypoint-hooks.d/post-upgrade
       - /share/docker_data/nextcloud/app-hooks/before-starting:/docker-entrypoint-hooks.d/before-starting        
-    environment:
-      - TZ=Europe/Bratislava
-      - MYSQL_PASSWORD=l4c1j4yd33Du5lo
-      - MYSQL_DATABASE=nextcloud
-      - MYSQL_USER=nextcloud
-      - MYSQL_HOST=db
-      - REDIS_HOST=redis
-      # - PHP_MEMORY_LIMIT=1024M
-      # - PHP_UPLOAD_LIMIT=1024M
-      # - NEXTCLOUD_MEMORY_LIMIT=1024M
+    env_file:
+      - stack.env
+
     networks:
       - nextcloud_network
       - pihole_pihole
@@ -56,15 +44,15 @@ services:
       - 192.168.78.254
     depends_on:
       - db
-    restart: unless-stopped
+    restart: ${RESTART:-unless-stopped}
     labels:
       com.centurylinklabs.watchtower.enable: true
       com.centurylinklabs.watchtower.lifecycle.post-update: "apt update;apt install -y smbclient;chown -R www-data:www-data /var/www/html"
   redis:
-    image: redis:alpine
+    image: ${DOCKER_REGISTRY:-}redis:alpine
     volumes:
       - /share/docker_data/nextcloud/redis:/data
     networks:
       - nextcloud_network
       
-    restart: unless-stopped
+    restart: ${RESTART:-unless-stopped}
diff --git a/nextcloud/stack.env b/nextcloud/stack.env
new file mode 100644
index 0000000..fc46f19
--- /dev/null
+++ b/nextcloud/stack.env
@@ -0,0 +1,10 @@
+TZ=Europe/Bratislava
+MYSQL_ROOT_PASSWORD=l4c1j4yd33Du5lo
+MYSQL_PASSWORD=l4c1j4yd33Du5lo
+MYSQL_DATABASE=nextcloud
+MYSQL_USER=nextcloud
+MYSQL_HOST=db
+REDIS_HOST=redis
+# - PHP_MEMORY_LIMIT=1024M
+# - PHP_UPLOAD_LIMIT=1024M
+# - NEXTCLOUD_MEMORY_LIMIT=1024M
\ No newline at end of file