From 5d6b295013236eaded5623c6a31eed2d067c7b64 Mon Sep 17 00:00:00 2001
From: Ezra Buehler <ezra@easyb.ch>
Date: Wed, 9 Feb 2022 07:19:49 +0100
Subject: [PATCH 1/2] Add support for custom NGINX config

Including *.conf files in /etc/nginx/conf.d same as the default NGINX
configuration gives the user more flexibility.
---
 core/nginx/conf/nginx.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf
index 8fee8989..5d56f76b 100644
--- a/core/nginx/conf/nginx.conf
+++ b/core/nginx/conf/nginx.conf
@@ -248,6 +248,8 @@ http {
         proxy_pass http://$admin/internal$request_uri;
       }
     }
+
+    include /etc/nginx/conf.d/*.conf;
 }
 
 mail {

From e48e2cdc1ae827f6e048f972f823d863d7a57ef9 Mon Sep 17 00:00:00 2001
From: Ezra Buehler <ezra@easyb.ch>
Date: Wed, 9 Feb 2022 07:43:51 +0100
Subject: [PATCH 2/2] Add 2221.feature

---
 towncrier/newsfragments/2221.feature | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 towncrier/newsfragments/2221.feature

diff --git a/towncrier/newsfragments/2221.feature b/towncrier/newsfragments/2221.feature
new file mode 100644
index 00000000..60795d36
--- /dev/null
+++ b/towncrier/newsfragments/2221.feature
@@ -0,0 +1 @@
+Add support for custom NGINX config in /etc/nginx/conf.d.