Merge pull request #115 from DO1JLR/u

U
DO1JLR · Apr 27, 2024 · 2b23584 · 2b23584
2 parents 23f9054 + 6a5c41e
commit 2b23584
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 7 deletions.
diff --git a/.gitmodules b/.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
diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general
diff --git a/collections/ansible_collections/l3d/linux b/collections/ansible_collections/l3d/linux
diff --git a/collections/ansible_collections/prometheus/prometheus b/collections/ansible_collections/prometheus/prometheus
diff --git a/group_vars/all/vars.yml b/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

diff --git a/host_vars/web01.l3d.space/vars.yml b/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'

diff --git a/roles/robertdebock.dovecot b/roles/robertdebock.dovecot
diff --git a/roles/robertdebock.fail2ban b/roles/robertdebock.fail2ban
diff --git a/site.yml b/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'}

diff --git a/templates/files/nginx/sites/fsck-2024.winkekatze.tv_tls.conf b/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;
+  }
+}
diff --git a/templates/files/nginx/sites/www.fsck-2024.winkekatze.tv_tls.conf b/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;
+        }
+}
+3 −4		tests/integration/targets/snap/tasks/main.yml
+20 −23		tests/integration/targets/snap/tasks/test_channel.yml
+4 −4		.github/workflows/ansible-ci.yml
+8 −4		.github/workflows/conventional-label.yml
+1 −1		.github/workflows/publish.yml
+4 −4		.github/workflows/release.yml
+2 −2		.github/workflows/version_bumper.yml
+5 −0		CHANGELOG.rst
+1 −0		changelogs/.plugin-cache.yaml
+323 −318		changelogs/changelog.yaml
+6 −0		renovate.json
+1 −1		roles/node_exporter/defaults/main.yml
+1 −1		roles/node_exporter/meta/argument_specs.yml