From: Grant Slater <git@firefishy.com>
Date: Mon, 2 Jan 2017 22:12:02 +0000 (+0000)
Subject: tilecache: cleaner nginx reload
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/f29b9ed2427f24b45e3372ff8005f4341e377319?ds=sidebyside

tilecache: cleaner nginx reload
---

diff --git a/cookbooks/tilecache/templates/default/nginx_generate_tilecache_qos_map.erb b/cookbooks/tilecache/templates/default/nginx_generate_tilecache_qos_map.erb
index 32c2e4459..9a386a3e7 100755
--- a/cookbooks/tilecache/templates/default/nginx_generate_tilecache_qos_map.erb
+++ b/cookbooks/tilecache/templates/default/nginx_generate_tilecache_qos_map.erb
@@ -41,4 +41,5 @@ default 'qos_token=${QOS_TOKEN_DEFAULT}; Max-Age=${VALID_TOKEN}; Domain=openstre
 "${QOS_TOKEN_OSM}" ''; # Do not Set-Cookie. # Exclusive
 EOF
 
-/etc/init.d/nginx configtest && service nginx reload
+# Check config, reload config and fail safe
+/etc/init.d/nginx configtest && ( /usr/sbin/service nginx reload || true )