From 9333421a62727efdc9835f9b9b2a566c06b4f67c Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Sun, 13 Jan 2019 16:52:20 -0500
Subject: [PATCH] Removed networking, miscellaneous fixes

---
 templates/XWiki/0/docker-compose.yml  | 44 +++++++--------------------
 templates/XWiki/0/rancher-compose.yml | 12 +-------
 2 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml
index c1ae212..0de619a 100644
--- a/templates/XWiki/0/docker-compose.yml
+++ b/templates/XWiki/0/docker-compose.yml
@@ -3,7 +3,6 @@ version: '2'
 services:
   xwiki:
     image: xwiki:stable-postgres-tomcat
-    container_name: xwiki
     dns:
       - 1.1.1.1
       - 1.0.0.1
@@ -17,37 +16,26 @@ services:
       {{- if .Values.HOST_LABEL}}
       io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
       {{- end}}
-      {{- if .Values.TRAEFIK_HOST}}
       traefik.enable: true
       ### Start Web Segment
-      traefik.frontend.entryPoints: http,https
-      traefik.frontend.headers.forceSTSHeader: true
-      traefik.frontend.headers.referrerPolicy: no-referrer
-      traefik.frontend.headers.SSLRedirect: true
-      traefik.frontend.headers.STSPreload: true
-      traefik.frontend.headers.STSSeconds: 15552000
-      traefik.frontend.rule: ${TRAEFIK_HOST}
-      traefik.port: "8080"
+      traefik.web.frontend.entryPoints: http, https
+      traefik.web.frontend.headers.forceSTSHeader: true
+#      traefik.web.frontend.headers.referrerPolicy: no-referrer
+#      traefik.web.frontend.headers.SSLRedirect: true
+#      traefik.web.frontend.headers.STSPreload: true
+#      traefik.web.frontend.headers.STSSeconds: 15552000
+      traefik.web.frontend.rule: ${TRAEFIK_HOST}
+      traefik.web.port: "8080"
       ### End Web Segment
-      {{- else}}
-      traefik.enable: false
-      {{- end}}
     links:
-      - postgresql # Using links because "depends_on" does not work in Rancher 1.6
-    networks:
-      - public-proxy
-    {{- if .Values.WEB_PORT}}
-    ports:
-      - "${WEB_PORT}:8080"
-    {{- end}}
+      - postgresql
     restart: on-failure
     volumes:
       - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system
       - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
-      - /RancherCattle/${DATA_DIR}/Application:/usr/local/xwiki
+      - /RancherCattle/${DATA_DIR}/XWiki:/usr/local/xwiki
   postgresql:
     image: postgres:alpine
-    container_name: postgresql
     dns:
       - 1.1.1.1
       - 1.0.0.1
@@ -62,18 +50,8 @@ services:
       {{- if .Values.HOST_LABEL}}
       io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
       {{- end}}
-    networks:
-      db-admin:
-        aliases:
-          - xwiki
     restart: on-failure
     volumes:
       - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system
       - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
-      - /RancherCattle/${DATA_DIR}/Database:/var/lib/postgresql/data
-
-networks:
-  db-admin:
-    external: true
-  public-proxy:
-    external: true
\ No newline at end of file
+      - /RancherCattle/${DATA_DIR}/Database:/var/lib/postgresql/data
\ No newline at end of file
diff --git a/templates/XWiki/0/rancher-compose.yml b/templates/XWiki/0/rancher-compose.yml
index 59bd5ee..3fa7b19 100644
--- a/templates/XWiki/0/rancher-compose.yml
+++ b/templates/XWiki/0/rancher-compose.yml
@@ -20,20 +20,10 @@ catalog:
       label: "Public Host Domain"
       description: |
         The host that Traefik will use to provide public access.
-        Leaving this empty will disable Traefik on this stack.
       default: "HostRegexp:{subdomain:.*}subdomain.domain.tld"
-      required: false
+      required: true
       type: string
 
-    - variable: "WEB_PORT"
-      label: "Web Port"
-      description: |
-        The port to locally access the web interface on.
-        Leaving this empty will disable opening any port on the host system.
-      default: "11100"
-      required: false
-      type: string # "Int" sometimes causes problems, and not a huge issue
-
     - variable: "DB_ROOT_PASS"
       label: "Database Root Password"
       description: |