diff options
| author | Geir Storli <geirstorli@yahoo.no> | 2017-06-13 12:36:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-13 12:36:46 +0200 |
| commit | f419f0ddb911a25df4bf6d150f4b4ccabfe9e751 (patch) | |
| tree | 83ab56794d0e0234a1b6bb056c5039f8a37ebdc3 /configserver | |
| parent | c22a6c001052c2dc491650662448e3009721e605 (diff) | |
| parent | 9212b86108683e9f9db1dac6697b911fc61569a0 (diff) | |
Merge pull request #2725 from yahoo/toregge/rename-configd-programs
Rename configd programs to have vespa- prefix.
Diffstat (limited to 'configserver')
| -rwxr-xr-x | configserver/src/main/sh/start-configserver | 6 | ||||
| -rwxr-xr-x | configserver/src/main/sh/stop-configserver | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index 4d85b3e65b3..3c43f230094 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -101,8 +101,8 @@ export LD_LIBRARY_PATH=${VESPA_HOME}lib64 #Does not need fast allocation export MALLOC_ARENA_MAX=1 -run-as-yahoo ${VESPA_HOME}libexec/vespa/start-filedistribution -run-as-yahoo ${VESPA_HOME}libexec/vespa/start-logd +vespa-run-as-vespa-user ${VESPA_HOME}libexec/vespa/start-filedistribution +vespa-run-as-vespa-user ${VESPA_HOME}libexec/vespa/start-logd # stuff for the configserver process: @@ -128,7 +128,7 @@ printenv > $cfpfile mkdir -p $bundlecachedir chown -R ${VESPA_USER} $bundlecachedir -run-as-yahoo vespa-runserver -s configserver -r 30 -p $pidfile -- \ +vespa-run-as-vespa-user vespa-runserver -s configserver -r 30 -p $pidfile -- \ java \ -Xms128m -Xmx2048m \ -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${VESPA_HOME}var/crash \ diff --git a/configserver/src/main/sh/stop-configserver b/configserver/src/main/sh/stop-configserver index 04867dd180e..371c2e6aafd 100755 --- a/configserver/src/main/sh/stop-configserver +++ b/configserver/src/main/sh/stop-configserver @@ -80,15 +80,15 @@ export VESPA_LOG_TARGET multitenant=$cloudconfig_server__multitenant if [ "$multitenant" = "true" ]; then - run-as-yahoo vespa-runserver -s filedistributor -p $PIDFILE_FILEDISTRIBUTOR -S - run-as-yahoo vespa-runserver -s logd -p $PIDFILE_LOGD -S + vespa-run-as-vespa-user vespa-runserver -s filedistributor -p $PIDFILE_FILEDISTRIBUTOR -S + vespa-run-as-vespa-user vespa-runserver -s logd -p $PIDFILE_LOGD -S fi # Try shutting down this way in case of upgrade. Can be removed in later versions. -run-as-yahoo vespa-runserver -s configserver -p $PIDFILE_CONFIGSERVER -S +vespa-run-as-vespa-user vespa-runserver -s configserver -p $PIDFILE_CONFIGSERVER -S if [ -e "$PIDFILE_CONFIGSERVER" ]; then export UNPRIVILEGED=1 export PID_FILE=$PIDFILE_CONFIGSERVER - exec run-as-yahoo ${ROOT}/bin/jdisc_container_stop + exec vespa-run-as-vespa-user ${ROOT}/bin/jdisc_container_stop fi |