From f1d4a6ee3b95b06aff96cb18a326b4c57826c5b6 Mon Sep 17 00:00:00 2001
From: sido <sido@haakma.org>
Date: Tue, 11 Sep 2018 13:04:28 +0200
Subject: [PATCH] specify administrator password

---
 molgenis/README.md     | 11 ++++++++---
 molgenis/questions.yml | 11 +++++++++--
 molgenis/values.yaml   |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/molgenis/README.md b/molgenis/README.md
index c189ebc..77fd852 100644
--- a/molgenis/README.md
+++ b/molgenis/README.md
@@ -6,8 +6,8 @@ This chart spins up a MOLGENIS instance with HTTPD. The created containers are:
 
 - MOLGENIS
 
-## Versions
-You can choose from which registry you want to pull from. There are 2:
+## Provisioning
+You can choose from which registry you want to pull. There are 2 registries:
 - https://registry.molgenis.org
 - https://hub.docker.com
 
@@ -17,7 +17,12 @@ The three properties you need to specify are:
 - ```molgenis.image.repository```
 - ```molgenis.image.name```
 - ```molgenis.image.tag```
- 
+
+Besides determining which image you want to pull, you also have to set an administrator password. You can do this by specifying the following property. 
+- ```molgenis.adminPassword```
+
+If you do not specify a password. You can find a one time password in the MOLGENIS container logging.
+
 ## Services
 When you start MOLGENIS you need:
 - an elasticsearch instance (5.5.6) 
diff --git a/molgenis/questions.yml b/molgenis/questions.yml
index 03bec0a..7bfb071 100644
--- a/molgenis/questions.yml
+++ b/molgenis/questions.yml
@@ -18,14 +18,21 @@ questions:
   - "registry.hub.docker.com"
   - "registry.molgenis.org"
   required: true
-  group: "Version"
+  group: "Provisioning"
 - variable: molgenis.image.tag
   label: Version
   default: ""
   description: "Select a MOLGENIS version (check the registry.molgenis.org or hub.docker.com for released tags)"
   type: string
   required: true
-  group: "Version"
+  group: "Provisioning"
+- variable: molgenis.adminPassword
+  label: Administrator password
+  default: ""
+  description: "Enter an administrator password"
+  type: password
+  required: false
+  group: "Provisioning"
 - variable: molgenis.services.opencpu.host
   label: OpenCPU cluster
   default: "localhost"
diff --git a/molgenis/values.yaml b/molgenis/values.yaml
index f1e2622..86d3cc1 100644
--- a/molgenis/values.yaml
+++ b/molgenis/values.yaml
@@ -21,7 +21,7 @@ molgenis:
     name: molgenis/molgenis-app
     tag: stable
     pullPolicy: Always
-  adminPassword: admin
+  adminPassword:
   javaOpts:
     maxHeapSpace: "1g"
   resources: