From 698f203936f1d7313603cb5263a92cce77f12e7e Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Tue, 13 Feb 2024 14:01:40 +0100
Subject: [PATCH] bundles/nginx: add option to not redirect domain aliases

---
 bundles/nginx/files/site_template | 6 +++++-
 bundles/nginx/metadata.py         | 1 +
 nodes/carlene.toml                | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bundles/nginx/files/site_template b/bundles/nginx/files/site_template
index 0a70a56..59d7ac4 100644
--- a/bundles/nginx/files/site_template
+++ b/bundles/nginx/files/site_template
@@ -22,7 +22,7 @@ server {
 %  endif
 }
 
-%  if domain_aliases:
+%  if domain_aliases and force_domain:
 server {
     server_name ${' '.join(sorted(domain_aliases))};
 
@@ -61,7 +61,11 @@ server {
 
 %  endif
 server {
+%  if domain_aliases and not force_domain:
+    server_name ${domain} ${' '.join(sorted(domain_aliases))};
+%  else:
     server_name ${domain};
+%  endif
 
     root ${webroot if webroot else '/var/www/{}/'.format(vhost)};
     index ${' '.join(index)};
diff --git a/bundles/nginx/metadata.py b/bundles/nginx/metadata.py
index e47e84d..e52bc11 100644
--- a/bundles/nginx/metadata.py
+++ b/bundles/nginx/metadata.py
@@ -81,6 +81,7 @@ def letsencrypt(metadata):
             domains[domain] = config.get('domain_aliases', set())
             vhosts[vhost] = {
                 'ssl': 'letsencrypt',
+                'force_domain': True,
             }
 
     return {
diff --git a/nodes/carlene.toml b/nodes/carlene.toml
index b5e8825..e509a2c 100644
--- a/nodes/carlene.toml
+++ b/nodes/carlene.toml
@@ -146,6 +146,7 @@ domain_aliases = [
     "mta-sts.franzi.business",
     "mta-sts.kunsmann.eu",
 ]
+force_domain = false
 
 [metadata.nginx.vhosts.redirector]
 domain = "kunbox.net"