summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorJon Bratseth <jonbratseth@yahoo.com>2017-06-08 13:20:35 +0200
committerGitHub <noreply@github.com>2017-06-08 13:20:35 +0200
commit25809a32e2a9227d92e355483984e9ba592358f4 (patch)
tree6b8a36cf15cf7718e95ce40fbba128960e0a4858 /configserver
parent7b2cbc0dab1cbdabb209c0a92566f3682334febb (diff)
parent3ccff246aa757000db84711949d1486dc7344198 (diff)
Merge pull request #2670 from yahoo/arnej/less-hardcoded-yahoo
Arnej/less hardcoded yahoo
Diffstat (limited to 'configserver')
-rwxr-xr-xconfigserver/src/main/sh/start-configserver6
1 files changed, 3 insertions, 3 deletions
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 \