From 39fca70610440cddeb50439af2d1913eacd70886 Mon Sep 17 00:00:00 2001
From: leone <leone@next-hat.com>
Date: Fri, 29 Dec 2023 23:12:25 +0100
Subject: [PATCH] release/ncproxy: 0.10.1 nightly (#789)

* release/ncproxy: 0.10.1 nightly
---
 bin/ncproxy/changelog.md                   | 6 ++++++
 bin/ncproxy/specs/swagger.yaml             | 2 +-
 bin/ncproxy/src/models/templates/http.conf | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bin/ncproxy/changelog.md b/bin/ncproxy/changelog.md
index ae118c1dd..03bcdcd40 100644
--- a/bin/ncproxy/changelog.md
+++ b/bin/ncproxy/changelog.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.10.1] - 2023-12-29
+
+### Fixed
+
+- SSL redirection even when not enabled
+
 ## [0.10.0] - 2023-12-28
 
 ### Changed
diff --git a/bin/ncproxy/specs/swagger.yaml b/bin/ncproxy/specs/swagger.yaml
index eabcf6e24..4d2b8112b 100644
--- a/bin/ncproxy/specs/swagger.yaml
+++ b/bin/ncproxy/specs/swagger.yaml
@@ -20,7 +20,7 @@ info:
     email: team@next-hat.com
   license:
     name: MIT OR Apache-2.0
-  version: v0.10.0
+  version: v0.10.1
 servers:
 - url: /{Version}
   variables:
diff --git a/bin/ncproxy/src/models/templates/http.conf b/bin/ncproxy/src/models/templates/http.conf
index 2549683a3..376472923 100644
--- a/bin/ncproxy/src/models/templates/http.conf
+++ b/bin/ncproxy/src/models/templates/http.conf
@@ -1,13 +1,13 @@
 server {
   listen {{ listen }};
+  {% if ssl %}
+  listen {{ listen_https }} http2 ssl;
+  {% endif %}
   {% if domain %}server_name {{ domain }};
-
   if ($host != {{ domain }}) {
     return 502;
   }{% endif %}
   {% if ssl %}
-  listen {{ listen_https }} http2 ssl;
-
   if ($scheme != https) {
       return 301 https://$host$request_uri;
   }