From 3ccdb07bba6664c6f76aa5685d8a3939f7762a16 Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Fri, 29 Mar 2019 13:38:35 -0400
Subject: [PATCH] Traefik fixes during setup

---
 .../generators/app/prompters/999_installer.js | 67 +++++++++++--------
 1 file changed, 38 insertions(+), 29 deletions(-)

diff --git a/install/generator-cyphernode/generators/app/prompters/999_installer.js b/install/generator-cyphernode/generators/app/prompters/999_installer.js
index 7461666..db54821 100644
--- a/install/generator-cyphernode/generators/app/prompters/999_installer.js
+++ b/install/generator-cyphernode/generators/app/prompters/999_installer.js
@@ -30,35 +30,6 @@ module.exports = {
         value: "docker"
       }]
     },
-    {
-      when: installerDocker,
-      type: 'list',
-      name: 'gatekeeper_datapath',
-      default: utils._getDefault( 'gatekeeper_datapath' ),
-      choices: [
-        {
-          name: utils.setupDir+"/cyphernode/gatekeeper",
-          value: utils.setupDir+"/cyphernode/gatekeeper"
-        },
-        {
-          name: utils.defaultDataDirBase+"/cyphernode/gatekeeper",
-          value: utils.defaultDataDirBase+"/cyphernode/gatekeeper"
-        },
-        {
-          name: utils.defaultDataDirBase+"/.cyphernode/gatekeeper",
-          value: utils.defaultDataDirBase+"/.cyphernode/gatekeeper"
-        },
-        {
-          name: utils.defaultDataDirBase+"/gatekeeper",
-          value: utils.defaultDataDirBase+"/gatekeeper"
-        },
-        {
-          name: "Custom path",
-          value: "_custom"
-        }
-        ],
-      message: prefix()+'Where do you want to store your gatekeeper data?'+utils._getHelp('gatekeeper_datapath'),
-    },
     {
       when: installerDocker,
       type: 'list',
@@ -88,6 +59,44 @@ module.exports = {
       ],
       message: prefix()+'Where do you want to store your traefik data?'+utils._getHelp('traefik_datapath'),
     },
+    {
+      when: (props)=>{ return installerDocker(props) && (props.traefik_datapath === '_custom') },
+      type: 'input',
+      name: 'traefik_datapath_custom',
+      default: utils._getDefault( 'traefik_datapath_custom' ),
+      filter: utils._trimFilter,
+      validate: utils._pathValidator,
+      message: prefix()+'Custom path for traefik data?'+utils._getHelp('traefik_datapath_custom'),
+    },
+    {
+      when: installerDocker,
+      type: 'list',
+      name: 'gatekeeper_datapath',
+      default: utils._getDefault( 'gatekeeper_datapath' ),
+      choices: [
+        {
+          name: utils.setupDir+"/cyphernode/gatekeeper",
+          value: utils.setupDir+"/cyphernode/gatekeeper"
+        },
+        {
+          name: utils.defaultDataDirBase+"/cyphernode/gatekeeper",
+          value: utils.defaultDataDirBase+"/cyphernode/gatekeeper"
+        },
+        {
+          name: utils.defaultDataDirBase+"/.cyphernode/gatekeeper",
+          value: utils.defaultDataDirBase+"/.cyphernode/gatekeeper"
+        },
+        {
+          name: utils.defaultDataDirBase+"/gatekeeper",
+          value: utils.defaultDataDirBase+"/gatekeeper"
+        },
+        {
+          name: "Custom path",
+          value: "_custom"
+        }
+        ],
+      message: prefix()+'Where do you want to store your gatekeeper data?'+utils._getHelp('gatekeeper_datapath'),
+    },
     {
       when: (props)=>{ return installerDocker(props) && (props.gatekeeper_datapath === '_custom') },
       type: 'input',