From b808a4b86ce3a4399276ac858aa44aa4125e4320 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <9000802+WilliamMiceli@users.noreply.github.com>
Date: Thu, 23 Aug 2018 21:14:38 -0400
Subject: [PATCH] Testing a more vanilla configuration

---
 templates/Nextcloud/0/docker-compose.yml  | 19 ++++++++-----------
 templates/Nextcloud/0/rancher-compose.yml |  4 ++--
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/templates/Nextcloud/0/docker-compose.yml b/templates/Nextcloud/0/docker-compose.yml
index 4b23382..a7737b9 100644
--- a/templates/Nextcloud/0/docker-compose.yml
+++ b/templates/Nextcloud/0/docker-compose.yml
@@ -19,19 +19,16 @@ services:
       io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
       {{- end}}
       traefik.enable: true
-      traefik.alias: cloudtest.williammiceli.systems
       traefik.frontend.rule: Host:cloudtest.williammiceli.systems
-      traefik.port: 9500
-      traefik.acme: true
+      traefik.port: "${WEB_PORT}"
       traefik.backend: Nextcloud
-      traefik.frontend.entryPoints: http,https
-      traefik.docker.network: public
+      traefik.frontend.entryPoints: http
     links:
       - mysql
-    networks:
-      - public-proxy
+#    networks:
+#      - public-proxy
     ports:
-      - "${HOST_HTTP_PORT}:80"
+      - "${WEB_PORT}:80"
     restart: on-failure
     volumes:
       - Application:/var/www/html
@@ -55,9 +52,9 @@ services:
     volumes:
       - Database:/var/lib/mysql
 
-networks:
-  public-proxy:
-    external: true
+#networks:
+#  public-proxy:
+#    external: true
 
 volumes:
   Application:
diff --git a/templates/Nextcloud/0/rancher-compose.yml b/templates/Nextcloud/0/rancher-compose.yml
index b0e9d07..be976ad 100644
--- a/templates/Nextcloud/0/rancher-compose.yml
+++ b/templates/Nextcloud/0/rancher-compose.yml
@@ -16,10 +16,10 @@ catalog:
       required: false
       type: string
 
-    - variable: HOST_HTTP_PORT
+    - variable: WEB_PORT
       label: Port
       description: |
-        The HTTP port to access the web interface on.
+        The port to access the web interface on.
       default: "10100"
       required: true
       type: string