neutral default for VESPA_USER

3 files changed, 29 insertions, 21 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 \
diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh
index 39107ae5500..8cd296b61c2 100755
--- a/vespabase/src/common-env.sh
+++ b/vespabase/src/common-env.sh
@@ -100,10 +100,10 @@ populate_environment () {
 
     read_conf_file
     consider_fallback ROOT ${VESPA_HOME%/}
-    if id yahoo >/dev/null 2>&1 ; then
-        consider_fallback VESPA_USER "yahoo"
-    elif id vespa >/dev/null 2>&1 ; then
+    if id vespa >/dev/null 2>&1 ; then
         consider_fallback VESPA_USER "vespa"
+    elif id nobody >/dev/null 2>&1 ; then
+        consider_fallback VESPA_USER "nobody"
     fi
 }
 
diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh
index b617516d61e..b6444c37548 100755
--- a/vespabase/src/rhel-prestart.sh
+++ b/vespabase/src/rhel-prestart.sh
@@ -59,7 +59,9 @@ findroot
 # END environment bootstrap section
 
 [ "$VESPA_HOME" ] || { echo "Missing VESPA_HOME variable" 1>&2; exit 1; }
-[ "$VESPA_USER" ] || { echo "Missing VESPA_USER variable" 1>&2; exit 1; }
+if [ "$VESPA_USER" = "" ]; then
+    VESPA_USER=$(id -run)
+fi
 
 cd $VESPA_HOME || { echo "Cannot cd to $VESPA_HOME" 1>&2; exit 1; }