From ea02dfb0e7c7a580d4ffc4b713e587ec7bf2ad92 Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Sun, 5 May 2019 21:13:42 -0400
Subject: [PATCH] Database passwords now optional

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

diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml
index d70fde4..ad8cead 100644
--- a/templates/XWiki/0/docker-compose.yml
+++ b/templates/XWiki/0/docker-compose.yml
@@ -10,7 +10,9 @@ services:
       DB_HOST: postgresql
       DB_DATABASE: xwiki_db
       DB_USER: xwiki_user
+      {{- if .Values.DB_USER_PASS}}
       DB_PASSWORD: ${DB_USER_PASS}
+      {{- end}}
     labels:
       io.rancher.container.pull_image: always
       {{- if .Values.HOST_LABEL}}
@@ -43,9 +45,13 @@ services:
     environment:
       POSTGRES_INITDB_ARGS: "--encoding=UTF8"
       POSTGRES_DB: xwiki_db
+      {{- if .Values.DB_ROOT_PASS}}
       POSTGRES_ROOT_PASSWORD: ${DB_ROOT_PASS}
+      {{- end}}
       POSTGRES_USER: xwiki_user
+      {{- if .Values.DB_USER_PASS}}
       POSTGRES_PASSWORD: ${DB_USER_PASS}
+      {{- end}}
     labels:
       io.rancher.container.pull_image: always
       {{- if .Values.HOST_LABEL}}
diff --git a/templates/XWiki/0/rancher-compose.yml b/templates/XWiki/0/rancher-compose.yml
index b9f34ae..1e9bb88 100644
--- a/templates/XWiki/0/rancher-compose.yml
+++ b/templates/XWiki/0/rancher-compose.yml
@@ -30,7 +30,7 @@ catalog:
       description: |
         A secure password to be used by the "root" database user.
       # default:
-      required: true
+      required: false
       type: password
 
     - variable: "DB_USER_PASS"
@@ -38,7 +38,7 @@ catalog:
       description: |
         A secure password to be used by the "xwiki_user" database user.
       # default:
-      required: true
+      required: false
       type: password
 
     - variable: "DATA_DIR"