diff options
| author | Arne Juul <arnej@yahoo-inc.com> | 2017-09-08 07:51:51 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahoo-inc.com> | 2017-09-08 07:51:51 +0000 |
| commit | 692c6ee908c0253445fd3191c85f58e427566873 (patch) | |
| tree | 7814cdb1fa47e1805db14167ea82cffff969482f /config-proxy | |
| parent | 7e11447015f88a0a627ae5aec534d59271f5f234 (diff) | |
use Defaults::vespaHostname
Diffstat (limited to 'config-proxy')
| -rwxr-xr-x | config-proxy/src/main/sh/vespa-config-ctl | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/config-proxy/src/main/sh/vespa-config-ctl b/config-proxy/src/main/sh/vespa-config-ctl index c1d4b9613e7..db96fe0eadb 100755 --- a/config-proxy/src/main/sh/vespa-config-ctl +++ b/config-proxy/src/main/sh/vespa-config-ctl @@ -81,16 +81,7 @@ export VESPA_SENTINEL_PORT mkdir -p "$LOGDIR" mkdir -p "$VESPA_LOG_CONTROL_DIR" -# sanity check hostname -hname=$(hostname) -canon=$(perl -e 'use Socket; - my $hostname = `hostname`; chomp($hostname); - my ($err, @results) = Socket::getaddrinfo($hostname, 0, {"flags" => Socket::AI_CANONNAME}); - print @results[0]->{"canonname"} . "\n";') -if [ "$hname" != "$canon" ]; then - echo "The hostname ($hname) must match with gethostbyname (was $canon)" - exit 1 -fi +hname=$(vespa-print-default hostname) CONFIG_ID="hosts/$hname" export CONFIG_ID @@ -120,7 +111,7 @@ case $1 in fail=true for ((sleepcount=0;$sleepcount<600;sleepcount=$sleepcount+1)) ; do usleep 100000 - if [ -f $P_CONFIG_PROXY ] && kill -0 `cat $P_CONFIG_PROXY` && vespa-ping-configproxy -s `hostname` 2>/dev/null + if [ -f $P_CONFIG_PROXY ] && kill -0 `cat $P_CONFIG_PROXY` && vespa-ping-configproxy -s $hname 2>/dev/null then echo "config proxy started (runserver pid `cat $P_CONFIG_PROXY`)" fail=false |