diff --git a/host_vars/web01.l3d.space/vars.yml b/host_vars/web01.l3d.space/vars.yml index a1f7df8..c8ba0a7 100644 --- a/host_vars/web01.l3d.space/vars.yml +++ b/host_vars/web01.l3d.space/vars.yml @@ -138,8 +138,6 @@ nginx_sites: - name: 'www.podcast.c3woc.de' - name: 'podcast.c3woc.org' - name: 'www.podcast.c3woc.org' - - name: 'podcast.c3vvoc.de' - - name: 'www.podcast.c3vvoc.de' - name: 'podcast.c3woc.eu' - name: 'www.podcast.c3woc.eu' - name: 'angel.systems' diff --git a/roles/do1jlr.acmetool b/roles/do1jlr.acmetool index 31c6ede..2590767 160000 --- a/roles/do1jlr.acmetool +++ b/roles/do1jlr.acmetool @@ -1 +1 @@ -Subproject commit 31c6ede356177d58191aa3b6ffbafe5c0eff46ee +Subproject commit 25907677aaa7e9467bad04bf9576f460bf890da8 diff --git a/templates/files/nginx/sites/podcast.c3vvoc.de_tls.conf b/templates/files/nginx/sites/podcast.c3vvoc.de_tls.conf deleted file mode 100644 index ba8ff8d..0000000 --- a/templates/files/nginx/sites/podcast.c3vvoc.de_tls.conf +++ /dev/null @@ -1,14 +0,0 @@ -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - - server_name www.podcast.c3vvoc.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://podcast.c3woc.de$request_uri; - } -} diff --git a/templates/files/nginx/sites/www.podcast.c3vvoc.de_tls.conf b/templates/files/nginx/sites/www.podcast.c3vvoc.de_tls.conf deleted file mode 100644 index c6d5e6f..0000000 --- a/templates/files/nginx/sites/www.podcast.c3vvoc.de_tls.conf +++ /dev/null @@ -1,14 +0,0 @@ -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - - server_name podcast.c3vvoc.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://podcast.c3woc.de$request_uri; - } -}