From 76f37d22028074ab81e92af977aede706791b231 Mon Sep 17 00:00:00 2001
From: L3D <l3d@c3woc.de>
Date: Wed, 1 Nov 2023 17:49:24 +0100
Subject: [PATCH] Adding aalend geekend

---
 .../ansible_collections/community/general       |  2 +-
 host_vars/web01.l3d.space/vars.yml              |  4 ++++
 roles/do1jlr.dotfiles                           |  2 +-
 .../aalen-geekend-23.winkekatze.tv_tls.conf     | 17 +++++++++++++++++
 .../www.aalen-geekend-23.winkekatze.tv_tls.conf | 14 ++++++++++++++
 5 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 templates/files/nginx/sites/aalen-geekend-23.winkekatze.tv_tls.conf
 create mode 100644 templates/files/nginx/sites/www.aalen-geekend-23.winkekatze.tv_tls.conf

diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general
index 8055dd1..6d0bcec 160000
--- a/collections/ansible_collections/community/general
+++ b/collections/ansible_collections/community/general
@@ -1 +1 @@
-Subproject commit 8055dd1c9b7787b7259d870be1418aafb877ed32
+Subproject commit 6d0bcec1cb579ce7244b3042177d44ca1abd9573
diff --git a/host_vars/web01.l3d.space/vars.yml b/host_vars/web01.l3d.space/vars.yml
index 8faa291..7c69d4b 100644
--- a/host_vars/web01.l3d.space/vars.yml
+++ b/host_vars/web01.l3d.space/vars.yml
@@ -181,6 +181,10 @@ nginx_sites:
   - name: 'www.xn--see-br-0xa.se'
   - name: 'thelaend.xn--see-br-0xa.se'
   - name: 'www.thelaend.xn--see-br-0xa.se'
+  - name: 'aalen-geekend-23.winkekatze.tv'
+    webroot:
+      user: 'winkekatze'
+  - name: 'www.aalen-geekend-23.winkekatze.tv'
   - name: 'winkekatze.tv'
     webroot:
       user: 'winkekatze'
diff --git a/roles/do1jlr.dotfiles b/roles/do1jlr.dotfiles
index 5cd1afc..9d86ed9 160000
--- a/roles/do1jlr.dotfiles
+++ b/roles/do1jlr.dotfiles
@@ -1 +1 @@
-Subproject commit 5cd1afc65018125ee419917b9b87bb8d038f6fcc
+Subproject commit 9d86ed9130ab4058fd617979ece2f71766665115
diff --git a/templates/files/nginx/sites/aalen-geekend-23.winkekatze.tv_tls.conf b/templates/files/nginx/sites/aalen-geekend-23.winkekatze.tv_tls.conf
new file mode 100644
index 0000000..fdc89ea
--- /dev/null
+++ b/templates/files/nginx/sites/aalen-geekend-23.winkekatze.tv_tls.conf
@@ -0,0 +1,17 @@
+server {
+  listen 443 ssl http2;
+  listen [::]:443 ssl http2;
+
+  server_name aalen-geekend-23.winkekatze.tv;
+
+  include snippets/tls_parameters_{{ site.name }}.snippet.conf;
+  include snippets/tls_certificate_{{ site.name }}.snippet.conf;
+  include snippets/logging_{{ site.name }}.snippet.conf;
+
+  root /srv/www/aalen-geekend-23.winkekatze.tv;
+
+  location / {
+    charset utf-8;
+    try_files $uri $uri/ =404;
+  }
+}
diff --git a/templates/files/nginx/sites/www.aalen-geekend-23.winkekatze.tv_tls.conf b/templates/files/nginx/sites/www.aalen-geekend-23.winkekatze.tv_tls.conf
new file mode 100644
index 0000000..4ea1aee
--- /dev/null
+++ b/templates/files/nginx/sites/www.aalen-geekend-23.winkekatze.tv_tls.conf
@@ -0,0 +1,14 @@
+server {
+        listen 443 ssl http2;
+        listen [::]:443 ssl http2;
+
+        server_name www.aalen-geekend-23.winkekatze.tv;
+
+        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://aalen-geekend-23.winkekatze.tv$request_uri;
+        }
+}