Skip to content

Commit b800e9b

Browse files
committed
fix(router): restore check_cmd and grep nginx.conf
We were having issues with router coming up due to "<no value>" being templated into /etc/nginx/nginx.conf. Thanks @gabrtv.
1 parent a4eb89e commit b800e9b

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

controller/bin/boot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ until confd -onetime -node $ETCD -config-file /app/confd.toml 2>/dev/null; do
4242
done
4343

4444
# wait for confd to populate all values
45-
while grep -q '<no value>' /templates/confd_settings.py; do
45+
while grep -q '<no value>' /etc/nginx/nginx.conf; do
4646
echo "controller: waiting for confd to write all values..."
4747
confd -onetime -node $ETCD -config-file /app/confd.toml 2>/dev/null
4848
sleep $(($ETCD_TTL/2)) # sleep for half the TTL

router/conf.d/nginx.conf.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ keys = [
1010
"/deis/domains",
1111
"/deis/controller",
1212
]
13-
#check_cmd = "/usr/sbin/nginx -t -c {{ .src }}"
13+
check_cmd = "/usr/sbin/nginx -t -c {{ .src }}"
1414
reload_cmd = "/usr/sbin/nginx -s reload"

0 commit comments

Comments
 (0)