diff --git a/.gitmodules b/.gitmodules index b9c0ba5..e7c2a03 100644 --- a/.gitmodules +++ b/.gitmodules @@ -105,9 +105,6 @@ [submodule "collections/ansible_collections/community/mysql"] path = collections/ansible_collections/community/mysql url = https://github.com/ansible-collections/community.mysql.git -[submodule "collections/ansible_collections/community/general"] - path = collections/ansible_collections/community/general - url = https://github.com/ansible-collections/community.general.git [submodule "collections/ansible_collections/community/crypto"] path = collections/ansible_collections/community/crypto url = https://github.com/ansible-collections/community.crypto.git @@ -135,3 +132,6 @@ [submodule "roles/unattended_upgrades"] path = roles/unattended_upgrades url = https://github.com/hifis-net/ansible-role-unattended-upgrades.git +[submodule "collections/ansible_collections/community/general"] + path = collections/ansible_collections/community/general + url = https://github.com/ansible-collections/community.general.git diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general index 2a7f9f2..48e860b 160000 --- a/collections/ansible_collections/community/general +++ b/collections/ansible_collections/community/general @@ -1 +1 @@ -Subproject commit 2a7f9f28b9f5f846cc0b763b03314dd6c9a00057 +Subproject commit 48e860be2033dc96127127d4355311301a6b31fa diff --git a/collections/ansible_collections/community/grafana b/collections/ansible_collections/community/grafana index 2202c99..ff49e95 160000 --- a/collections/ansible_collections/community/grafana +++ b/collections/ansible_collections/community/grafana @@ -1 +1 @@ -Subproject commit 2202c99c0e24d8bce9346959af79c67aaf1a4610 +Subproject commit ff49e951e5656ce3298fd7e958fb9845add59193 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/robertdebock.dovecot b/roles/robertdebock.dovecot index b7f46a2..1f8a3b6 160000 --- a/roles/robertdebock.dovecot +++ b/roles/robertdebock.dovecot @@ -1 +1 @@ -Subproject commit b7f46a2fe10d1924433e72d934ca8de6bb4589b9 +Subproject commit 1f8a3b6ee4ff2d6267bddbcd70bdf84642541eb3 diff --git a/roles/robertdebock.fail2ban b/roles/robertdebock.fail2ban index 7c8482c..62a1594 160000 --- a/roles/robertdebock.fail2ban +++ b/roles/robertdebock.fail2ban @@ -1 +1 @@ -Subproject commit 7c8482cfb6d3ed16e0eb70f87cb91947e03514d6 +Subproject commit 62a159418601b628e33267467fdf031b88006b62 diff --git a/roles/unattended_upgrades b/roles/unattended_upgrades index f7b8f6f..c0d0c56 160000 --- a/roles/unattended_upgrades +++ b/roles/unattended_upgrades @@ -1 +1 @@ -Subproject commit f7b8f6f3ffbd0d2f2eff104071fae388c0d592e9 +Subproject commit c0d0c569ebef916fe0bbb5cfa5e3f1bbd7a28751 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; + } +}