From 5108e8e3135d24b5edd941c76f34df046cfbd6fd Mon Sep 17 00:00:00 2001
From: Daniel Carrera <daniel.r.carrera@outlook.com>
Date: Thu, 25 Jun 2020 18:05:26 -0400
Subject: [PATCH] Merge http & https server blocks

---
 nginx.tmpl | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/nginx.tmpl b/nginx.tmpl
index d221859..48ac467 100644
--- a/nginx.tmpl
+++ b/nginx.tmpl
@@ -445,22 +445,17 @@ server {
 
 {{ if $is_https }}
 
-{{ if eq $https_method "redirect" }}
 server {
 	server_name {{ $host_alias }};
-	listen 80 {{ $default_server }};
-	{{ if $enable_ipv6 }}
-	listen [::]:80 {{ $default_server }};
+	{{ if eq $https_method "redirect" }}
+	listen {{ $external_http_port }} {{ $default_server }};
 	{{ end }}
-	access_log /var/log/nginx/access.log vhost;
-	return 301 https://{{ $first_host }}$request_uri;
-}
-{{ end }}
-server {
-	server_name {{ $host_alias }};
-	listen 443 ssl http2 {{ $default_server }};
+	listen {{ $external_https_port }} ssl http2 {{ $default_server }};
 	{{ if $enable_ipv6 }}
-	listen [::]:443 ssl http2 {{ $default_server }};
+	{{ if eq $https_method "redirect" }}
+	listen [::]:{{ $external_http_port }} {{ $default_server }};
+	{{ end }}
+	listen [::]:{{ $external_https_port }} ssl http2 {{ $default_server }};
 	{{ end }}
 	access_log /var/log/nginx/access.log vhost;