From ca4f025cc866cf0f94a9620281abd1123c94b1e5 Mon Sep 17 00:00:00 2001
From: Nick Yeoman <c@nickyeoman.com>
Date: Sun, 18 Aug 2024 16:27:25 -0700
Subject: [PATCH] updated nextcloud

---
 nextcloud/README.md          | 15 ++++++++++
 nextcloud/docker-compose.yml | 56 ++++++------------------------------
 nextcloud/env-sample         | 11 -------
 nextcloud/sample-extends.yml | 12 ++++++++
 nextcloud/sample.env         | 10 +++++++
 5 files changed, 46 insertions(+), 58 deletions(-)
 create mode 100644 nextcloud/README.md
 delete mode 100644 nextcloud/env-sample
 create mode 100644 nextcloud/sample-extends.yml
 create mode 100644 nextcloud/sample.env

diff --git a/nextcloud/README.md b/nextcloud/README.md
new file mode 100644
index 0000000..a56ffa2
--- /dev/null
+++ b/nextcloud/README.md
@@ -0,0 +1,15 @@
+# nextcloud
+
+Docker Hub: https://hub.docker.com/_/nextcloud
+Proxy Port: 80
+
+## Useful commands
+
+```bash
+sudo -u www-data php occ app:list
+sudo -u www-data php occ app:disable <appname>
+sudo -u www-data php occ maintenance:mode --on
+php occ trashbin:cleanup --all-users
+
+docker-compose exec --user www-data nextcloud php occ
+```
\ No newline at end of file
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index f525bd7..2cddd60 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -1,51 +1,13 @@
-################################################################################
-# Nextcloud
-#
-# Version 1
-#
-# useful commands:
-# php occ trashbin:cleanup --all-users
-################################################################################
-version: '3.3'
-
-volumes:
-  nextcloud-db:
-  nextcloud:
-
-networks:
-  admin_web:
-    external:
-      name: admin_web
+version: '3.8'
 
 services:
-
-  nextcloud-db:
-    image: mariadb:${DB_V}
-    restart: always
-    volumes:
-      - nextcloud-db:/var/lib/mysql
-    networks:
-      - admin_web
-    environment:
-      MYSQL_ROOT_PASSWORD: ${NEXTCLOUD_MYSQL_ROOT_PASSWORD}
-      MYSQL_USER: nextcloud
-      MYSQL_PASSWORD: ${NEXTCLOUD_MYSQL_PASSWORD}
-      MYSQL_DATABASE: db_nextcloud
-
   nextcloud:
-    image: nextcloud:${NEXTCLOUD_V}
-    stdin_open: true
-    tty: true
-    networks:
-      - admin_web
-    restart: always
-    links:
-      - nextcloud-db
+    image: ${NEXTCLOUD_IMAGE:-nextcloud:latest}
+    restart: unless-stopped
+    environment:
+      - MYSQL_PASSWORD=${NEXTCLOUD_DB_PASSWORD:-password}
+      - MYSQL_DATABASE=${NEXTCLOUD_DB:-nextcloud}
+      - MYSQL_USER=${NEXTCLOUD_DB_USER:-nextcloud}
+      - MYSQL_HOST=${NEXTCLOUD_DB_HOST:-nextcloud-db}
     volumes:
-      - nextcloud:/var/www/html
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.${PREFIX}_nextcloud.rule=Host(`${NEXTCLOUD_DOMAIN_NAME}`)"
-      - "traefik.http.routers.${PREFIX}_nextcloud.entrypoints=websecure"
-      - "traefik.http.routers.${PREFIX}_nextcloud.tls.certresolver=letsencrypt"
-      - "traefik.http.services.${PREFIX}_nextcloud.loadbalancer.server.port=80"
+      - ${VOL_PATH:-./data}/nextcloud:/var/www/html
diff --git a/nextcloud/env-sample b/nextcloud/env-sample
deleted file mode 100644
index 45045a6..0000000
--- a/nextcloud/env-sample
+++ /dev/null
@@ -1,11 +0,0 @@
-# Domains & Project
-PREFIX=p1
-NEXTCLOUD_DOMAIN_NAME=nextcloud.nickyeoman.com
-
-# Passwords
-NEXTCLOUD_MYSQL_ROOT_PASSWORD=ChangeMe2ASecurepass!
-NEXTCLOUD_MYSQL_PASSWORD=Again2ASecurepass!
-
-# Software versions
-DB_V=10.4.11
-NEXTCLOUD_V=18.0.3-apache
diff --git a/nextcloud/sample-extends.yml b/nextcloud/sample-extends.yml
new file mode 100644
index 0000000..d38e6d8
--- /dev/null
+++ b/nextcloud/sample-extends.yml
@@ -0,0 +1,12 @@
+version: '3.4'
+
+services:
+  nextcloud:
+    extends:
+      file: ${COOKBOOK}/nextcloud/docker-compose.yml
+      service: nextcloud
+
+  nextcloud-mariadb:
+		extends:
+			file: ${COOKBOOK}/mariadb/docker-compose.yml
+			service: mariadb
\ No newline at end of file
diff --git a/nextcloud/sample.env b/nextcloud/sample.env
new file mode 100644
index 0000000..ed09470
--- /dev/null
+++ b/nextcloud/sample.env
@@ -0,0 +1,10 @@
+# GLOBAL
+COOKBOOK=/git/docker-compose-cookbooks #HELP: cookbooks
+VOL_PATH=./data #HELP: volpath
+
+# nextcloud
+NEXTCLOUD_IMAGE=nextcloud:latest
+NEXTCLOUD_DB_PASSWORD=password
+NEXTCLOUD_DB=nextcloud
+NEXTCLOUD_DB_USER=nextcloud
+NEXTCLOUD_DB_HOST=nextcloud-db