diff --git a/stack.sh b/stack.sh index 2a6a0c4274..0cec623a54 100755 --- a/stack.sh +++ b/stack.sh @@ -501,9 +501,6 @@ SYSLOG_PORT=${SYSLOG_PORT:-516} # Use color for logging output (only available if syslog is not used) LOG_COLOR=`trueorfalse True $LOG_COLOR` -# Service startup timeout -SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60} - # Reset the bundle of CA certificates SSL_BUNDLE_FILE="$DATA_DIR/ca-bundle.pem" rm -f $SSL_BUNDLE_FILE diff --git a/stackrc b/stackrc index c6f0f6af39..af45c7718b 100644 --- a/stackrc +++ b/stackrc @@ -580,6 +580,11 @@ SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http} # Also sets the minimum number of workers to 2. API_WORKERS=${API_WORKERS:=$(( ($(nproc)/2)<2 ? 2 : ($(nproc)/2) ))} +# Service startup timeout +SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60} + +# Following entries need to be last items in file + # Local variables: # mode: shell-script # End: