From 2cf840ff1a62b81235318bf8860d7be87f7b090e Mon Sep 17 00:00:00 2001
From: jash <jash@schulterklopfer-productions.de>
Date: Mon, 29 Oct 2018 23:06:44 +0100
Subject: [PATCH] added run_as_user prompts

---
 .../generators/app/prompters/000_cyphernode.js           | 9 +++++++++
 .../generators/app/templates/installer/config.sh         | 2 +-
 .../generators/app/templates/installer/start.sh          | 8 ++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/install/generator-cyphernode/generators/app/prompters/000_cyphernode.js b/install/generator-cyphernode/generators/app/prompters/000_cyphernode.js
index d412855..6228880 100644
--- a/install/generator-cyphernode/generators/app/prompters/000_cyphernode.js
+++ b/install/generator-cyphernode/generators/app/prompters/000_cyphernode.js
@@ -37,6 +37,15 @@ module.exports = {
       }]
     },
     {
+      type: 'confirm',
+      name: 'run_as_different_user',
+      default: utils._getDefault( 'run_as_different_user' ),
+      message: prefix()+'Run as different user?'+utils._getHelp('gatekeeper_edit_ipwhitelist')
+    },
+    {
+      when: function( props ) { 
+        return props.run_as_different_user;
+      },
       type: 'input',
       name: 'username',
       default: utils._getDefault( 'username' ),
diff --git a/install/generator-cyphernode/generators/app/templates/installer/config.sh b/install/generator-cyphernode/generators/app/templates/installer/config.sh
index e4cb587..79b2ed7 100644
--- a/install/generator-cyphernode/generators/app/templates/installer/config.sh
+++ b/install/generator-cyphernode/generators/app/templates/installer/config.sh
@@ -9,4 +9,4 @@ LIGHTNING_DATAPATH=<%= lightning_datapath %>
 PROXY_DATAPATH=<%= proxy_datapath %>
 GATEKEEPER_DATAPATH=<%= gatekeeper_datapath %>
 DOCKER_MODE=<%= docker_mode %>
-USERNAME=<%= username %>
+RUN_AS_USER=<%= run_as_different_user?username:'' %>
diff --git a/install/generator-cyphernode/generators/app/templates/installer/start.sh b/install/generator-cyphernode/generators/app/templates/installer/start.sh
index b844b44..0cec47a 100644
--- a/install/generator-cyphernode/generators/app/templates/installer/start.sh
+++ b/install/generator-cyphernode/generators/app/templates/installer/start.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-<% if (docker_mode == 'swarm') { %>
-export USER=$(id -u):$(id -g)
+# run as user <%= username %>
+export USER=$(id -u <%= run_as_different_user?username:'' %>):$(id -g <%= run_as_different_user?username:'' %>)
 export ARCH=$(uname -m)
+
+<% if (docker_mode == 'swarm') { %>
 docker stack deploy -c docker-compose.yaml cyphernode
 <% } else if(docker_mode == 'compose') { %>
-export USER=$(id -u):$(id -g)
-export ARCH=$(uname -m)
 docker-compose -f docker-compose.yaml up -d --remove-orphans
 <% } %>
\ No newline at end of file