diff options
author | Arne Juul <arnej@yahoo-inc.com> | 2017-07-19 10:04:14 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahoo-inc.com> | 2017-07-25 14:44:53 +0000 |
commit | cca12ccd22ce7e55055965165609a8844d3e7136 (patch) | |
tree | 962453b3d4a1f48a1cad95ccf180862d1e05492b /configserver | |
parent | 19b2fd525e1a297180d03e505f180ffbbf9ec798 (diff) |
neutral default for VESPA_USER
Diffstat (limited to 'configserver')
-rwxr-xr-x | configserver/src/main/sh/start-configserver | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index 39d8342d7b3..43bb6b2ba83 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -60,15 +60,29 @@ findroot cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; } -if [ -f ${VESPA_HOME}/conf/zookeeper/zookeeper.cfg ]; then - chown ${VESPA_USER} ${VESPA_HOME}/conf/zookeeper/zookeeper.cfg - chmod 644 ${VESPA_HOME}/conf/zookeeper/zookeeper.cfg -fi +fixfile () { + if [ -f $1 ]; then + if [ "${VESPA_USER}" ]; then + chown ${VESPA_USER} $1 + fi + chmod 644 $1 + fi +} -if [ -f ${VESPA_HOME}/var/zookeeper/myid ]; then - chown ${VESPA_USER} ${VESPA_HOME}/var/zookeeper/myid - chmod 644 ${VESPA_HOME}/var/zookeeper/myid -fi +fixddir () { + if ! [ -d $1 ]; then + echo "Creating data directory $1" + mkdir -p $1 || exit 1 + fi + if [ "${VESPA_USER}" ]; then + chown ${VESPA_USER} $1 + fi + chmod 755 $1 +} + +fixfile ${VESPA_HOME}/conf/zookeeper/zookeeper.cfg +fixfile ${VESPA_HOME}/var/zookeeper/myid +fixddir ${VESPA_HOME}/var/zookeeper/version-2 ${VESPA_HOME}/libexec/vespa/vespa-config.pl -isthisaconfigserver 1>/dev/null if [ "$?" != "0" ] ; then @@ -79,13 +93,6 @@ fi fixlimits checkjava -ZOOKEEPER_DATA_PATH="${VESPA_HOME}/var/zookeeper/version-2" -if [ ! -d "$ZOOKEEPER_DATA_PATH" ]; then - echo "Creating data directory $ZOOKEEPER_DATA_PATH" - mkdir -p $ZOOKEEPER_DATA_PATH - chown yahoo:users $ZOOKEEPER_DATA_PATH -fi - ZOOKEEPER_LOG_FILE="${VESPA_HOME}/logs/vespa/zookeeper.configserver.log" rm -f $ZOOKEEPER_LOG_FILE*lck @@ -123,8 +130,7 @@ serveruserargs="$cloudconfig_server__jvmargs" jvmargs="$baseuserargs $serveruserargs" printenv > $cfpfile -mkdir -p $bundlecachedir -chown -R ${VESPA_USER} $bundlecachedir +fixddir $bundlecachedir vespa-run-as-vespa-user vespa-runserver -s configserver -r 30 -p $pidfile -- \ java \ |