diff options
| -rwxr-xr-x | configserver/src/main/sh/start-configserver | 6 | ||||
| -rwxr-xr-x | zkfacade/src/main/sh/zkcli | 5 |
2 files changed, 7 insertions, 4 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 \ diff --git a/zkfacade/src/main/sh/zkcli b/zkfacade/src/main/sh/zkcli index d0add5f33a0..c9763287809 100755 --- a/zkfacade/src/main/sh/zkcli +++ b/zkfacade/src/main/sh/zkcli @@ -60,4 +60,7 @@ findroot # END environment bootstrap section -sudo -u yahoo java -cp $VESPA_HOME/lib/jars/zkctl-jar-with-dependencies.jar -Dlog4j.configuration=file:$VESPA_HOME/etc/log4j-vespa.properties org.apache.zookeeper.ZooKeeperMain +sudo -u ${VESPA_USER} java \ + -cp $VESPA_HOME/lib/jars/zkctl-jar-with-dependencies.jar \ + -Dlog4j.configuration=file:$VESPA_HOME/etc/log4j-vespa.properties \ + org.apache.zookeeper.ZooKeeperMain |