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
This commit is contained in:
jmq 2019-02-11 17:06:04 -06:00
parent 77f41c71a3
commit 5fa68b90df
2 changed files with 3 additions and 3 deletions

View File

@ -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}" >>${USER_HOME}/.ssh/${SSH_KEY_FILE}
echo -e "${SSH_KEY_CONFIGURATION}" >>${USER_HOME}/.ssh/config 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 0700 -R ${USER_HOME}/.ssh
chmod 0644 ${USER_HOME}/.ssh/config chmod 0644 ${USER_HOME}/.ssh/config
chmod 0600 ${USER_HOME}/.ssh/${SSH_KEY_FILE} chmod 0600 ${USER_HOME}/.ssh/${SSH_KEY_FILE}

View File

@ -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}" >>${USER_HOME}/.ssh/${SSH_KEY_FILE}
echo -e "${SSH_KEY_CONFIGURATION}" >>${USER_HOME}/.ssh/config 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 0700 -R ${USER_HOME}/.ssh
chmod 0644 ${USER_HOME}/.ssh/config chmod 0644 ${USER_HOME}/.ssh/config
chmod 0600 ${USER_HOME}/.ssh/${SSH_KEY_FILE} chmod 0600 ${USER_HOME}/.ssh/${SSH_KEY_FILE}
@ -62,4 +62,4 @@ function stop() {
} }
$COMMAND $COMMAND