Merge pull request #242 from DO1JLR/dhcp24

DHCP24
DO1JLR · Nov 8, 2024 · cbb4473 · cbb4473
2 parents 9d69974 + 72d7df9
commit cbb4473
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 6 deletions.
diff --git a/collections/ansible_collections/ansible/posix b/collections/ansible_collections/ansible/posix
diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general
diff --git a/collections/ansible_collections/community/mysql b/collections/ansible_collections/community/mysql
diff --git a/collections/ansible_collections/grafana/grafana b/collections/ansible_collections/grafana/grafana
diff --git a/collections/ansible_collections/prometheus/prometheus b/collections/ansible_collections/prometheus/prometheus
diff --git a/host_vars/web01.l3d.space/vars.yml b/host_vars/web01.l3d.space/vars.yml
@@ -129,6 +129,10 @@ nginx_sites:
     webroot:
       user: 'winkekatze'
   - name: 'www.winkekatze.tv'
+  - name: 'dhcp24.winkekatze.tv'
+    webroot:
+      user: 'winkekatze'
+  - name: 'www.shcp24.winkekatze.tv'
   - name: 'klima-streik.de'
     webroot:
       user: 'klima'

diff --git a/roles/unattended_upgrades b/roles/unattended_upgrades
diff --git a/templates/files/nginx/sites/dhcp24.winkekatze.tv_tls.conf b/templates/files/nginx/sites/dhcp24.winkekatze.tv_tls.conf
@@ -0,0 +1,17 @@
+server {
+  listen 443 ssl http2;
+  listen [::]:443 ssl http2;
+
+  server_name dhcp24.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/dhcp24.winkekatze.tv;
+
+  location / {
+    charset utf-8;
+    try_files $uri $uri/ =404;
+  }
+}
diff --git a/templates/files/nginx/sites/www.dhcp24.winkekatze.tv_tls.conf b/templates/files/nginx/sites/www.dhcp24.winkekatze.tv_tls.conf
@@ -0,0 +1,14 @@
+server {
+        listen 443 ssl http2;
+        listen [::]:443 ssl http2;
+
+        server_name www.dhcp24.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://dhcp24.winkekatze.tv$request_uri;
+        }
+}
+2 −2		.azure-pipelines/azure-pipelines.yml
+58 −46		README.md
+3 −0		changelogs/fragments/587_update_README.yml
+3 −0		changelogs/fragments/588_ci_enable_devel.yml
+31 −5		CONTRIBUTORS
+12 −0		changelogs/fragments/671-modules_util_user.yml
+1 −1		plugins/module_utils/user.py
+112 −0		tests/integration/targets/test_mysql_user/tasks/issue-671.yaml
+6 −0		tests/integration/targets/test_mysql_user/tasks/main.yml
+8 −0		CHANGELOG.rst
+1 −1		changelogs/.plugin-cache.yaml
+72 −67		changelogs/changelog.yaml
+1 −1		galaxy.yml
+3 −3		roles/prometheus/tasks/configure.yml
+1 −1		roles/prometheus/templates/prometheus.service.j2
+0 −1		roles/prometheus/vars/main.yml