From 5fa68b90dfafbde1a011929cbb1f7df78ae93978 Mon Sep 17 00:00:00 2001 From: jmq Date: Mon, 11 Feb 2019 17:06:04 -0600 Subject: [PATCH] Fixed ranger/ranger-agent helm charts main deployment scripts to include $USER The "ranger" and "ranger-agent" user ids are hard coded in the helm services scripts. This prevents overriding them. Changed both scripts to use $USER instead of hard-coded values. Change-Id: I2dd9a667c6b33575324c179a8c10c394bf07ab47 --- ranger-agent/templates/bin/_ranger-agent-engine.sh.tpl | 2 +- ranger/templates/bin/_ranger-services.sh.tpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ranger-agent/templates/bin/_ranger-agent-engine.sh.tpl b/ranger-agent/templates/bin/_ranger-agent-engine.sh.tpl index 6b768f5f..905752e3 100755 --- a/ranger-agent/templates/bin/_ranger-agent-engine.sh.tpl +++ b/ranger-agent/templates/bin/_ranger-agent-engine.sh.tpl @@ -31,7 +31,7 @@ if [ -n "${SSH_KEY}" ] && [ -n "${SSH_KEY_CONFIGURATION}" ];then echo -e "${SSH_KEY}" >>${USER_HOME}/.ssh/${SSH_KEY_FILE} echo -e "${SSH_KEY_CONFIGURATION}" >>${USER_HOME}/.ssh/config - chown ranger_agent: ${USER_HOME}/.ssh + chown ${USER}: ${USER_HOME}/.ssh chmod 0700 -R ${USER_HOME}/.ssh chmod 0644 ${USER_HOME}/.ssh/config chmod 0600 ${USER_HOME}/.ssh/${SSH_KEY_FILE} diff --git a/ranger/templates/bin/_ranger-services.sh.tpl b/ranger/templates/bin/_ranger-services.sh.tpl index cf28b8c9..1f24a704 100755 --- a/ranger/templates/bin/_ranger-services.sh.tpl +++ b/ranger/templates/bin/_ranger-services.sh.tpl @@ -31,7 +31,7 @@ if [ -n "${SSH_KEY}" ] && [ -n "${SSH_KEY_CONFIGURATION}" ];then echo -e "${SSH_KEY}" >>${USER_HOME}/.ssh/${SSH_KEY_FILE} echo -e "${SSH_KEY_CONFIGURATION}" >>${USER_HOME}/.ssh/config - chown ranger: ${USER_HOME}/.ssh + chown ${USER}: ${USER_HOME}/.ssh chmod 0700 -R ${USER_HOME}/.ssh chmod 0644 ${USER_HOME}/.ssh/config chmod 0600 ${USER_HOME}/.ssh/${SSH_KEY_FILE} @@ -62,4 +62,4 @@ function stop() { } -$COMMAND \ No newline at end of file +$COMMAND