From 510e86b13018d0f8ef77f56d6dbcd2ca679de4de Mon Sep 17 00:00:00 2001
From: sido <sido@haakma.org>
Date: Fri, 23 Mar 2018 14:34:40 +0100
Subject: [PATCH 1/2] chore(molgenis.home): updated default value

---
 templates/molgenis/0/rancher-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/molgenis/0/rancher-compose.yml b/templates/molgenis/0/rancher-compose.yml
index e995666..bde70d6 100644
--- a/templates/molgenis/0/rancher-compose.yml
+++ b/templates/molgenis/0/rancher-compose.yml
@@ -38,7 +38,7 @@
       description: "Path of the molgenis home directory"
       label: "Home directory:"
       required: true
-      default: "/op/molgenis"
+      default: "/opt/molgenis"
       type: "string"
     - variable: "MOLGENIS_ADMIN_PASSWORD"
       description: "Passowrd the MOLGENIS admin"

From 6ed19d1777ec7537e0917a85e512b85d755f7317 Mon Sep 17 00:00:00 2001
From: sido <sido@haakma.org>
Date: Fri, 23 Mar 2018 14:58:52 +0100
Subject: [PATCH 2/2] fix(volume): map molgenis home directory to volume

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

diff --git a/templates/molgenis/0/docker-compose.yml b/templates/molgenis/0/docker-compose.yml
index 17d80e7..bca991a 100644
--- a/templates/molgenis/0/docker-compose.yml
+++ b/templates/molgenis/0/docker-compose.yml
@@ -9,13 +9,13 @@ services:
       - postgres
       - elasticsearch
     volumes:
-      - molgenis-data
+      - molgenis-data:/opt/molgenis
     environment:
       - "db_uri=jdbc:postgresql://postgres/${DB_SCHEME}?reWriteBatchedInserts=true&autosave=CONSERVATIVE"
       - "db_driver=org.postgresql.Driver"
       - "db_user=${DB_USERNAME}"
       - "db_password=${DB_PASSWORD}"
-      - "molgenis.home=${MOLGENIS_HOME_DIR}"
+      - "molgenis.home=/opt/molgenis"
       - "admin.password=${MOLGENIS_ADMIN_PASSWORD}"
       - "opencpu.uri.port=8004"
       - "elasticsearch.cluster.name=${ELASTIC_CLUSTER}"
diff --git a/templates/molgenis/0/rancher-compose.yml b/templates/molgenis/0/rancher-compose.yml
index bde70d6..f0f0073 100644
--- a/templates/molgenis/0/rancher-compose.yml
+++ b/templates/molgenis/0/rancher-compose.yml
@@ -34,12 +34,6 @@
       required: true
       default: "molgenis"
       type: "string"
-    - variable: "MOLGENIS_HOME_DIR"
-      description: "Path of the molgenis home directory"
-      label: "Home directory:"
-      required: true
-      default: "/opt/molgenis"
-      type: "string"
     - variable: "MOLGENIS_ADMIN_PASSWORD"
       description: "Passowrd the MOLGENIS admin"
       label: "MOLGENIS admin user password:"