Merge pull request #115 from DO1JLR/u

U

.gitmodules

@@ -150,3 +150,6 @@
 [submodule "roles/l3d.rustdesk"]
 	path = roles/l3d.rustdesk
 	url = https://github.com/roles-ansible/ansible_role_rustdesk.git
+[submodule "collections/ansible_collections/l3d/linux"]
+	path = collections/ansible_collections/l3d/linux
+	url = https://github.com/roles-ansible/ansible_collection_linux.git

collections/ansible_collections/community/general

@@ -1 +1 @@
-Subproject commit 62138b288a5db4f841a722edf4aaa1901d375e25
+Subproject commit 45c2e0f8d053a85976847b2b247b04c6aacaeb9d

collections/ansible_collections/l3d/linux

@@ -0,0 +1 @@
+Subproject commit f264c4a195b09646f8d10281f808fbb83e1ee0fc

collections/ansible_collections/prometheus/prometheus

@@ -1 +1 @@
-Subproject commit a3aaf709a5b758cde0c51e9f5e3f972906ac266d
+Subproject commit 96e7fd7718637b9a3cd36d363af5b418e70de390

group_vars/all/vars.yml

@@ -4,8 +4,8 @@ submodules_versioncheck: true
 check_ansible_version: '2.15.2'
 
 # l3d.packages
-l3d_pkgs__install_advanced: true
-l3d_pkgs__install_cli: true
+packages__install_advanced: true
+packages__install_cli: true
 
 # do1jlr.ntp
 ntp_set_time_zone: true

host_vars/web01.l3d.space/vars.yml

@@ -121,6 +121,10 @@ nginx_sites:
     webroot:
       user: 'winkekatze'
   - name: 'www.aalen-geekend-23.winkekatze.tv'
+  - name: 'fsck-2024.winkekatze.tv'
+    webroot:
+      user: 'winkekatze'
+  - name: 'www.fsck-2024.winkekatze.tv'
   - name: 'winkekatze.tv'
     webroot:
       user: 'winkekatze'

roles/robertdebock.dovecot

@@ -1 +1 @@
-Subproject commit 8b1cd4b9ceb7fd273ea5dece3b08646bdae3f097
+Subproject commit 11dc60ee1ad072a07eadfe72b71be52a220d5be1

roles/robertdebock.fail2ban

@@ -1 +1 @@
-Subproject commit 0e2a273c732fd6d453348e27eafab6b704443b6e
+Subproject commit 9a59fb2d5143034d769421824e439a16f2c87f56

site.yml

@@ -11,7 +11,7 @@
     - {role: l3d.users.admin, tags: [users, admin]}
     - {role: l3d.users.sshd, tags: [users, sshd]}
     - {role: l3d.users.dotfiles, tags: [users, dotfiles]}
-    - {role: l3d.packages, tags: [packages, general]}
+    - {role: l3d.linux.packages, tags: [packages, general]}
     - {role: do1jlr.ranger, tags: [packages, ranger]}
     - {role: gantsign.bat, tags: [packages, bat], when: [ansible_os_family == 'Debian' and "ansible_architecture" == "x86_64"]}
     - {role: unattended_upgrades, tags: [default, unattended, unattended_upgrades, security], become: true, when: ansible_distribution == 'Debian'}

templates/files/nginx/sites/fsck-2024.winkekatze.tv_tls.conf

@@ -0,0 +1,17 @@
+server {
+  listen 443 ssl http2;
+  listen [::]:443 ssl http2;
+
+  server_name fsck-2024.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/fsck-2024.winkekatze.tv;
+
+  location / {
+    charset utf-8;
+    try_files $uri $uri/ =404;
+  }
+}

templates/files/nginx/sites/www.fsck-2024.winkekatze.tv_tls.conf

@@ -0,0 +1,14 @@
+server {
+        listen 443 ssl http2;
+        listen [::]:443 ssl http2;
+
+        server_name www.fsck-2024.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://fsck-2024.winkekatze.tv$request_uri;
+        }
+}