From 5f2d5ae4a15514adc86e5c602ffc53f9c464841c Mon Sep 17 00:00:00 2001
From: L3D <l3d@c3woc.de>
Date: Wed, 24 May 2023 20:01:19 +0200
Subject: [PATCH] Improve all and add see-base.de

---
 .gitmodules                                     |  3 +++
 collections/ansible_collections/ansible/posix   |  1 +
 .../ansible_collections/community/crypto        |  2 +-
 .../ansible_collections/community/general       |  2 +-
 collections/ansible_collections/community/mysql |  2 +-
 host_vars/web01.l3d.space/vars.yml              |  6 ++++--
 roles/do1jlr.ntp                                |  2 +-
 roles/robertdebock.dovecot                      |  2 +-
 roles/robertdebock.fail2ban                     |  2 +-
 .../files/nginx/sites/see-base.de_tls.conf      | 17 +++++++++++++++++
 .../files/nginx/sites/www.see-base.de_tls.conf  | 14 ++++++++++++++
 11 files changed, 45 insertions(+), 8 deletions(-)
 create mode 160000 collections/ansible_collections/ansible/posix
 create mode 100644 templates/files/nginx/sites/see-base.de_tls.conf
 create mode 100644 templates/files/nginx/sites/www.see-base.de_tls.conf

diff --git a/.gitmodules b/.gitmodules
index f4df502..6cac062 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -126,3 +126,6 @@
 [submodule "collections/ansible_collections/l3d/git"]
 	path = collections/ansible_collections/l3d/git
 	url = https://github.com/roles-ansible/ansible_collection_git.git
+[submodule "collections/ansible_collections/ansible/posix"]
+	path = collections/ansible_collections/ansible/posix
+	url = https://github.com/ansible-collections/ansible.posix.git
diff --git a/collections/ansible_collections/ansible/posix b/collections/ansible_collections/ansible/posix
new file mode 160000
index 0000000..f48515a
--- /dev/null
+++ b/collections/ansible_collections/ansible/posix
@@ -0,0 +1 @@
+Subproject commit f48515aad3f253fd7f8a2830b42b0bd0fa6cd727
diff --git a/collections/ansible_collections/community/crypto b/collections/ansible_collections/community/crypto
index 3bcc0db..a402c48 160000
--- a/collections/ansible_collections/community/crypto
+++ b/collections/ansible_collections/community/crypto
@@ -1 +1 @@
-Subproject commit 3bcc0db4fce3f50d774e6f2ff98c5bb0ed7b55e2
+Subproject commit a402c485a37a699502464d952bad62c7d58c1f1a
diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general
index f833982..29790df 160000
--- a/collections/ansible_collections/community/general
+++ b/collections/ansible_collections/community/general
@@ -1 +1 @@
-Subproject commit f833982d6f686063288b9be2c3721aac8d35d521
+Subproject commit 29790df583ff5b7c6d0487bde57e27e37e9c423f
diff --git a/collections/ansible_collections/community/mysql b/collections/ansible_collections/community/mysql
index 7f7b2f7..bff05ce 160000
--- a/collections/ansible_collections/community/mysql
+++ b/collections/ansible_collections/community/mysql
@@ -1 +1 @@
-Subproject commit 7f7b2f76a663be0fc6487d7ebac09ab51e6f0168
+Subproject commit bff05ce8ddb99f53270ad11e753c153df604adb5
diff --git a/host_vars/web01.l3d.space/vars.yml b/host_vars/web01.l3d.space/vars.yml
index bac708e..8c09860 100644
--- a/host_vars/web01.l3d.space/vars.yml
+++ b/host_vars/web01.l3d.space/vars.yml
@@ -130,8 +130,6 @@ nginx_sites:
   - name: 'waffeln.eskalieren.jetzt'
   - name: 'waffeln.fehlerfrei.org'
   - name: 'www.waffeln.fehlerfrei.org'
-  - name: 'waffel.shop'
-  - name: 'www.waffel.shop'
   - name: 'l3d.space'
   - name: 'www.l3d.space'
   - name: 'ansible.l3d.space'
@@ -167,6 +165,10 @@ nginx_sites:
       user: 'preview'
   - name: 'waffelpate.de'
   - name: 'www.waffelpate.de'
+  - name: 'see-base.de'
+    webroot:
+      user: 'see'
+  - name: 'www.see-base.de'
   - name: 'xn--see-br-0xa.se'
     webroot:
       user: 'see'
diff --git a/roles/do1jlr.ntp b/roles/do1jlr.ntp
index c4ff771..ee881e6 160000
--- a/roles/do1jlr.ntp
+++ b/roles/do1jlr.ntp
@@ -1 +1 @@
-Subproject commit c4ff7711a14a9a34af60cfa122c9331d15760582
+Subproject commit ee881e6b0a206585ae836cdbaeb33dd3a5d2fe61
diff --git a/roles/robertdebock.dovecot b/roles/robertdebock.dovecot
index 688f12c..9462a81 160000
--- a/roles/robertdebock.dovecot
+++ b/roles/robertdebock.dovecot
@@ -1 +1 @@
-Subproject commit 688f12c67137c107ffa7a5e6606f34ebd9f47d16
+Subproject commit 9462a81aafc0e54bfc37cf860993a395d7863d5f
diff --git a/roles/robertdebock.fail2ban b/roles/robertdebock.fail2ban
index f9d6d80..ea61fc3 160000
--- a/roles/robertdebock.fail2ban
+++ b/roles/robertdebock.fail2ban
@@ -1 +1 @@
-Subproject commit f9d6d807748ebca36cc0480a9fb6c58b1e70cd62
+Subproject commit ea61fc33d2db8b505f65f166d4388857facb66fe
diff --git a/templates/files/nginx/sites/see-base.de_tls.conf b/templates/files/nginx/sites/see-base.de_tls.conf
new file mode 100644
index 0000000..bacb195
--- /dev/null
+++ b/templates/files/nginx/sites/see-base.de_tls.conf
@@ -0,0 +1,17 @@
+server {
+  listen 443 ssl http2;
+  listen [::]:443 ssl http2;
+
+  server_name see-base.de;
+
+  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/see-base.de;
+
+  location / {
+    charset utf-8;
+    try_files $uri $uri/ =404;
+  }
+}
diff --git a/templates/files/nginx/sites/www.see-base.de_tls.conf b/templates/files/nginx/sites/www.see-base.de_tls.conf
new file mode 100644
index 0000000..13e7a65
--- /dev/null
+++ b/templates/files/nginx/sites/www.see-base.de_tls.conf
@@ -0,0 +1,14 @@
+server {
+        listen 443 ssl http2;
+        listen [::]:443 ssl http2;
+
+        server_name www.see-base.de;
+
+        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://see-base.de$request_uri;
+        }
+}