From 405f4876b924d612085b4ae9a75b2d5658d10bdc Mon Sep 17 00:00:00 2001 From: Richard Bateman Date: Fri, 14 Aug 2015 12:10:47 -0600 Subject: [PATCH] As per pull request feedback, update names to be consistent --- nginx.tmpl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nginx.tmpl b/nginx.tmpl index 82ddb11..f211565 100644 --- a/nginx.tmpl +++ b/nginx.tmpl @@ -125,8 +125,8 @@ server { {{ if (exists (printf "/etc/nginx/vhost.d/%s" $host)) }} include {{ printf "/etc/nginx/vhost.d/%s" $host }}; - {{ else if (exists /etc/vhost.d/defaults) }} - include /etc/nginx/vhost.d/defaults + {{ else if (exists /etc/vhost.d/default) }} + include /etc/nginx/vhost.d/default {{ end }} location / { @@ -137,8 +137,8 @@ server { {{ end }} {{ if (exists (printf "/etc/nginx/vhost.d/%s_location" $host)) }} include {{ printf "/etc/nginx/vhost.d/%s_location"}} - {{ else if (exists /etc/vhost.d/defaults_location) }} - include /etc/nginx/vhost.d/defaults_location + {{ else if (exists /etc/vhost.d/default_location) }} + include /etc/nginx/vhost.d/default_location {{ end }} } } @@ -150,8 +150,8 @@ server { {{ if (exists (printf "/etc/nginx/vhost.d/%s" $host)) }} include {{ printf "/etc/nginx/vhost.d/%s" $host }}; - {{ else if (exists /etc/vhost.d/defaults) }} - include /etc/nginx/vhost.d/defaults + {{ else if (exists /etc/vhost.d/default) }} + include /etc/nginx/vhost.d/default {{ end }} location / { @@ -162,8 +162,8 @@ server { {{ end }} {{ if (exists (printf "/etc/nginx/vhost.d/%s_location" $host)) }} include {{ printf "/etc/nginx/vhost.d/%s_location"}} - {{ else if (exists /etc/vhost.d/defaults_location) }} - include /etc/nginx/vhost.d/defaults_location + {{ else if (exists /etc/vhost.d/default_location) }} + include /etc/nginx/vhost.d/default_location {{ end }} } }