From 5b131c4b489baa2ce36c71a34645122b2eea60d8 Mon Sep 17 00:00:00 2001
From: Simon Belbeoch <39310468+LiquidITGuy@users.noreply.github.com>
Date: Tue, 23 Jun 2020 03:21:19 +0200
Subject: [PATCH] update nextcloud from 18.x to 19.0 (#188)

* update nextcloud from 18.x to 19.0

* update nextcloud dev review + nginx optimization

* dev review P2
---
 public/v2/apps/nextcloud.json | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/public/v2/apps/nextcloud.json b/public/v2/apps/nextcloud.json
index 7fffdbc..742093a 100644
--- a/public/v2/apps/nextcloud.json
+++ b/public/v2/apps/nextcloud.json
@@ -32,6 +32,7 @@
                 ],
                 "restart": "always",
                 "environment": {
+                    "OVERWRITEPROTOCOL": "$$cap_http_https_cors",
                     "MYSQL_DATABASE": "nextcloud",
                     "MYSQL_USER": "$$cap_db_user",
                     "MYSQL_PASSWORD": "$$cap_db_pass",
@@ -45,13 +46,13 @@
     },
     "instructions": {
         "start": "A safe home for all your data. Access & share your files, calendars, contacts, mail & more from any device, on your terms. http://Nextcloud.com",
-        "end": "NextCloud is deployed and will be available on few minutes as $$cap_appname"
+        "end": "NextCloud is deployed and will be available on few minutes as $$cap_appname.\nIf you set the cors sections to https, please enable https on your app. If you do not activate it you will have an error.\n\nFor better performances and compliance, you can add \"add_header Strict-Transport-Security \"max-age=15552000; includeSubDomains\" always;\" below \"proxy_set_header X-Forwarded-Proto $scheme;\" into the nginx configuration."
     },
     "variables": [{
         "id": "$$cap_nextcloud_version",
         "label": "NextCloud Version",
-        "defaultValue": "18.0.4",
-        "description": "Check out their Docker page for the valid tags https://hub.docker.com/r/library/nextcloud/tags/\n\n do not use fpm versions.",
+        "defaultValue": "19.0.0",
+        "description": "Check out their Docker page for the valid tags https://hub.docker.com/r/library/nextcloud/tags/\n\ndo not use fpm versions.",
         "validRegex": "/^([^\\s^\\/])+$/"
     },{
         "id": "$$cap_mariadb_version",
@@ -81,5 +82,11 @@
         "label": "admin password",
         "description": "Password for the Nextcloud admin user.",
         "validRegex": "/.{1,}/"
+    },{
+        "id": "$$cap_http_https_cors",
+        "label": "Protocol of proxy",
+        "defaultValue": "https",
+        "description": "Choose either http or https. cors configuration to login are set by the docker image, if you do not set this same as your proxy configuration, login will fail",
+        "validRegex": "/^http[s]?$/"
     }]
 }