From 6965b1ead421340cae410d0672a680458f2b7a2a Mon Sep 17 00:00:00 2001
From: Wolfgang Ebner <wolfgang.ebner@catalysts.cc>
Date: Sun, 26 Jul 2015 11:38:45 +0200
Subject: [PATCH] fallback when DEFAULT_HOST is not set

---
 nginx.tmpl | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/nginx.tmpl b/nginx.tmpl
index 2c8afa0..b4140f9 100644
--- a/nginx.tmpl
+++ b/nginx.tmpl
@@ -72,7 +72,8 @@ upstream {{ $host }} {
 {{ end }}
 }
 
-{{ $default_server := and ($.Env.DEFAULT_HOST) (eq $.Env.DEFAULT_HOST $host) }}
+{{ $default_host := or ($.Env.DEFAULT_HOST) "" }}
+{{ $default_server := index (dict $host "" $default_host "default_server") $host }}
 
 {{/* Get the VIRTUAL_PROTO defined by containers w/ the same vhost, falling back to "http" */}}
 {{ $proto := or (first (groupByKeys $containers "Env.VIRTUAL_PROTO")) "http" }}
@@ -94,13 +95,13 @@ upstream {{ $host }} {
 
 server {
 	server_name {{ $host }};
-	listen 80 {{ if $default_server }}default_server{{ end  }};
+	listen 80 {{ $default_server }};
 	return 301 https://$host$request_uri;
 }
 
 server {
 	server_name {{ $host }};
-	listen 443 ssl spdy {{ if $default_server }}default_server{{ end  }};
+	listen 443 ssl spdy {{ $default_server }};
 
 	ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
 	ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA;
@@ -134,7 +135,7 @@ server {
 
 server {
 	server_name {{ $host }};
-	listen 80 {{ if $default_server }}default_server{{ end  }};
+	listen 80 {{ $default_server }};
 
 	{{ if (exists (printf "/etc/nginx/vhost.d/%s" $host)) }}
 	include {{ printf "/etc/nginx/vhost.d/%s" $host }};
@@ -152,7 +153,7 @@ server {
 {{ if (and (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }}
 server {
 	server_name {{ $host }};
-	listen 443 ssl spdy {{ if $default_server }}default_server{{ end  }};
+	listen 443 ssl spdy {{ $default_server }};
 	return 503;
 
 	ssl_certificate /etc/nginx/certs/default.crt;