From 3ccff246aa757000db84711949d1486dc7344198 Mon Sep 17 00:00:00 2001
From: Arne H Juul <arnej@yahoo-inc.com>
Date: Thu, 8 Jun 2017 10:04:41 +0200
Subject: use VESPA_USER env var

---
 configserver/src/main/sh/start-configserver | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'configserver')

diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver
index 48fdfb31361..4d85b3e65b3 100755
--- a/configserver/src/main/sh/start-configserver
+++ b/configserver/src/main/sh/start-configserver
@@ -63,12 +63,12 @@ findroot
 cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; }
 
 if [ -f ${VESPA_HOME}conf/zookeeper/zookeeper.cfg ]; then
-    chown yahoo ${VESPA_HOME}conf/zookeeper/zookeeper.cfg
+    chown ${VESPA_USER} ${VESPA_HOME}conf/zookeeper/zookeeper.cfg
     chmod 644 ${VESPA_HOME}conf/zookeeper/zookeeper.cfg
 fi
 
 if [ -f ${VESPA_HOME}var/zookeeper/myid ]; then
-    chown yahoo ${VESPA_HOME}var/zookeeper/myid
+    chown ${VESPA_USER} ${VESPA_HOME}var/zookeeper/myid
     chmod 644 ${VESPA_HOME}var/zookeeper/myid
 fi
 
@@ -126,7 +126,7 @@ jvmargs="$baseuserargs $serveruserargs"
 
 printenv > $cfpfile
 mkdir -p $bundlecachedir
-chown -R yahoo $bundlecachedir
+chown -R ${VESPA_USER} $bundlecachedir
 
 run-as-yahoo vespa-runserver -s configserver -r 30 -p $pidfile -- \
 	java \
-- 
cgit v1.2.3