From 369aa78795ebb5d6ee4b82d77f759f70fbf621ec Mon Sep 17 00:00:00 2001
From: Nicolas Meienberger <github@thisprops.com>
Date: Tue, 6 Sep 2022 08:50:30 +0200
Subject: [PATCH] feat(nextcloud): allow app exposure and domain

chore: bump nextcloud version string
---
 apps/nextcloud/config.json        |  5 +++--
 apps/nextcloud/docker-compose.yml | 21 +++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/apps/nextcloud/config.json b/apps/nextcloud/config.json
index a2fa9e96..c7eae54c 100644
--- a/apps/nextcloud/config.json
+++ b/apps/nextcloud/config.json
@@ -2,10 +2,11 @@
   "$schema": "../schema.json",
   "name": "Nextcloud",
   "available": true,
+  "exposable": true,
   "port": 8083,
   "id": "nextcloud",
-  "tipi_version": 1,
-  "version": "24.0.3",
+  "tipi_version": 2,
+  "version": "24.0.4",
   "categories": ["data"],
   "description": "Nextcloud is a self-hosted, open source, and fully-featured cloud storage solution for your personal files, office documents, and photos.",
   "short_desc": "Productivity platform that keeps you in control",
diff --git a/apps/nextcloud/docker-compose.yml b/apps/nextcloud/docker-compose.yml
index e35298aa..6168ec7c 100644
--- a/apps/nextcloud/docker-compose.yml
+++ b/apps/nextcloud/docker-compose.yml
@@ -25,7 +25,7 @@ services:
       - tipi_main_network
 
   cron:
-    image: nextcloud:24.0.3-apache
+    image: nextcloud:24.0.4-apache
     restart: on-failure
     volumes:
       - ${APP_DATA_DIR}/data/nextcloud:/var/www/html
@@ -38,7 +38,7 @@ services:
 
   nextcloud:
     container_name: nextcloud
-    image: nextcloud:24.0.3-apache
+    image: nextcloud:24.0.4-apache
     restart: unless-stopped
     ports:
       - ${APP_PORT}:80
@@ -52,16 +52,17 @@ services:
       - POSTGRES_DB=nextcloud
       - NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN_USER}
       - NEXTCLOUD_ADMIN_PASSWORD=${NEXTCLOUD_ADMIN_PASSWORD}
-      - NEXTCLOUD_TRUSTED_DOMAINS=${INTERNAL_IP}:${APP_PORT}
+      - NEXTCLOUD_TRUSTED_DOMAINS=${INTERNAL_IP}:${APP_PORT} ${APP_DOMAIN}
     depends_on:
       - db-nextcloud
       - redis-nextcloud
     networks:
       - tipi_main_network
-    # labels:
-    #     traefik.enable: true
-    #     traefik.http.routers.nextcloud.rule: Host(`nextcloud.tipi.home`)
-    #     traefik.http.routers.nextcloud.service: nextcloud
-    #     traefik.http.routers.nextcloud.tls: true
-    #     traefik.http.routers.nextcloud.entrypoints: websecure
-    #     traefik.http.services.nextcloud.loadbalancer.server.port: 80
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.nextcloud.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.nextcloud.entrypoints: websecure
+      traefik.http.routers.nextcloud.service: nextcloud
+      traefik.http.routers.nextcloud.tls.certresolver: myresolver
+      traefik.http.services.nextcloud.loadbalancer.server.port: 80
+