From d56255a21a19b875fcf07c8ca8976133cc61e65e Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Wed, 5 Dec 2018 22:16:09 -0500
Subject: [PATCH] Completed configuration, now to test

---
 templates/Guacamole/0/docker-compose.yml  | 24 ++++++++++++++++++-----
 templates/Guacamole/0/rancher-compose.yml | 24 +++++++++++++++++++++++
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/templates/Guacamole/0/docker-compose.yml b/templates/Guacamole/0/docker-compose.yml
index e051432..7e2c1c6 100644
--- a/templates/Guacamole/0/docker-compose.yml
+++ b/templates/Guacamole/0/docker-compose.yml
@@ -44,23 +44,37 @@ services:
       - 1.0.0.1
     environment:
     labels:
-    networks:
-    ports:
+      io.rancher.container.pull_image: always
+      {{- if .Values.HOST_LABEL}}
+      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
+      {{- end}}
     restart: on-failure
   mysql:
-    image:
+    image: mysql:latest
     dns:
       - 1.1.1.1
       - 1.0.0.1
     environment:
+      MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
       MYSQL_DATABASE: guacamole_db
       MYSQL_USER: guacamole_user
-      MYSQL_PASSWORD: password
+      MYSQL_PASSWORD: ${DB_USER_PASS}
     labels:
+      io.rancher.container.pull_image: always
+      {{- if .Values.HOST_LABEL}}
+      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
+      {{- end}}
     networks:
-    ports:
+      db-admin:
+        aliases:
+          - guacamole
     restart: on-failure
+    volumes:
+      - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
+      - /RancherCattleData/${DATA_DIR}/Database:/var/lib/mysql # MySQL Database to be persistent
 
 networks:
+  db-admin:
+    external: true
   public-proxy:
     external: true
\ No newline at end of file
diff --git a/templates/Guacamole/0/rancher-compose.yml b/templates/Guacamole/0/rancher-compose.yml
index 4c51c82..4ec108d 100644
--- a/templates/Guacamole/0/rancher-compose.yml
+++ b/templates/Guacamole/0/rancher-compose.yml
@@ -32,4 +32,28 @@ catalog:
         The port to locally access the web interface on.
       default: "10700"
       required: true
+      type: string
+
+    - variable: "DB_ROOT_PASS"
+      label: "MySQL Root Password"
+      description: |
+        A secure password to be used by the "root" MySQL user.
+      # default:
+      required: true
+      type: password
+
+    - variable: "DB_USER_PASS"
+      label: "MySQL User Password"
+      description: |
+        A secure password to be used by the "nextcloud_user" MySQL user.
+      # default:
+      required: true
+      type: password
+
+    - variable: "DATA_DIR"
+      label: "Data Directory"
+      description: |
+        The directory to store persistent data for the stack.
+      default: "Personal/Nextcloud"
+      required: true
       type: string
\ No newline at end of file