From b259ac3ec9d7df193082beb0b367521a7cbc8065 Mon Sep 17 00:00:00 2001
From: L3D <l3d@c3woc.de>
Date: Sun, 7 Feb 2021 05:26:03 +0100
Subject: [PATCH] add gnew domains

---
 host_vars/web01.l3d.space/vars.yml              |  2 ++
 roles/nginx2                                    |  2 +-
 templates/files/nginx/sites/l3d.ch_tls.conf     | 14 ++++++++++++++
 templates/files/nginx/sites/www.l3d.ch_tls.conf | 14 ++++++++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 templates/files/nginx/sites/l3d.ch_tls.conf
 create mode 100644 templates/files/nginx/sites/www.l3d.ch_tls.conf

diff --git a/host_vars/web01.l3d.space/vars.yml b/host_vars/web01.l3d.space/vars.yml
index d39cf56..06988bf 100644
--- a/host_vars/web01.l3d.space/vars.yml
+++ b/host_vars/web01.l3d.space/vars.yml
@@ -66,6 +66,8 @@ nginx_sites:
   - name: 'www.ansible.l3d.space'
   - name: 'l3d.yt'
   - name: 'www.l3d.yt'
+  - name: 'l3d.ch'
+  - name: 'www.l3d.ch'
   - name: 'podcast.c3woc.de'
     webroot:
       user: 'webwaffelpodcast'
diff --git a/roles/nginx2 b/roles/nginx2
index f14aad6..3dc0591 160000
--- a/roles/nginx2
+++ b/roles/nginx2
@@ -1 +1 @@
-Subproject commit f14aad6fc0a400e89496db6e747145bf79ef587d
+Subproject commit 3dc05913fc14de320d2a58747902709ef2536413
diff --git a/templates/files/nginx/sites/l3d.ch_tls.conf b/templates/files/nginx/sites/l3d.ch_tls.conf
new file mode 100644
index 0000000..24da2b7
--- /dev/null
+++ b/templates/files/nginx/sites/l3d.ch_tls.conf
@@ -0,0 +1,14 @@
+server {
+        listen 443 ssl http2;
+        listen [::]:443 ssl http2;
+
+        server_name l3d.ch;
+
+        include snippets/tls_parameters_{{ site.name }}.snippet.conf;
+        include snippets/tls_certificate_{{ site.name }}.snippet.conf;
+        include snippets/logging_{{ site.name }}.snippet.conf;
+
+        location / {
+                return 418;
+        }
+}
diff --git a/templates/files/nginx/sites/www.l3d.ch_tls.conf b/templates/files/nginx/sites/www.l3d.ch_tls.conf
new file mode 100644
index 0000000..61886a4
--- /dev/null
+++ b/templates/files/nginx/sites/www.l3d.ch_tls.conf
@@ -0,0 +1,14 @@
+server {
+        listen 443 ssl http2;
+        listen [::]:443 ssl http2;
+
+        server_name www.l3d.ch;
+
+        include snippets/tls_parameters_{{ site.name }}.snippet.conf;
+        include snippets/tls_certificate_{{ site.name }}.snippet.conf;
+        include snippets/logging_{{ site.name }}.snippet.conf;
+
+        location / {
+                return 308 https://l3d.ch$request_uri;
+        }
+}