From bb389f2ace2dfd3984ec745ca5d83c35497f9e2e Mon Sep 17 00:00:00 2001 From: L3D Date: Fri, 1 Jan 2021 04:50:47 +0100 Subject: [PATCH] c3woc podcast --- host_vars/web01.l3d.space.yml | 13 ++++++++++++- templates/files/nginx/sites/c3woc.de_tls.conf | 2 +- .../files/nginx/sites/podcast.c3woc.de_tls.conf | 16 ++++++++++++++++ .../files/nginx/sites/podcast.c3woc.org_tls.conf | 14 ++++++++++++++ .../nginx/sites/www.podcast.c3woc.de_tls.conf | 14 ++++++++++++++ .../nginx/sites/www.podcast.c3woc.org_tls.conf | 14 ++++++++++++++ 6 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 templates/files/nginx/sites/podcast.c3woc.de_tls.conf create mode 100644 templates/files/nginx/sites/podcast.c3woc.org_tls.conf create mode 100644 templates/files/nginx/sites/www.podcast.c3woc.de_tls.conf create mode 100644 templates/files/nginx/sites/www.podcast.c3woc.org_tls.conf diff --git a/host_vars/web01.l3d.space.yml b/host_vars/web01.l3d.space.yml index 09c1b39..ad2a3c9 100644 --- a/host_vars/web01.l3d.space.yml +++ b/host_vars/web01.l3d.space.yml @@ -14,11 +14,20 @@ users: - l3d@derpy.l3d.yt - l3d@backup-rsa.l3d.yt - l3d@business.wingcon.com + webwaffelpodcast: + - l3d@pinkie.l3d.yt + - l3d@mobile.l3d.yt + - l3d@backup.l3d.yt + - l3d@derpy.l3d.yt + - l3d@backup-rsa.l3d.yt + - l3d@business.wingcon.com + accounts: - l3d - webwaffel + - webwaffelpodcast nginx_sites: - name: 'c3woc.de' @@ -35,7 +44,9 @@ nginx_sites: - name: 'www.l3d.space' - name: 'ansible.l3d.space' - name: 'www.ansible.l3d.space' - + - name: 'podcast.c3woc.de' + webroot: + user: 'webwaffelpodcast' acme_notification_email: "acme_{{ inventory_hostname }}@l3d.yt" diff --git a/templates/files/nginx/sites/c3woc.de_tls.conf b/templates/files/nginx/sites/c3woc.de_tls.conf index b02a020..ef83f7f 100644 --- a/templates/files/nginx/sites/c3woc.de_tls.conf +++ b/templates/files/nginx/sites/c3woc.de_tls.conf @@ -8,7 +8,7 @@ server { include snippets/tls_certificate_{{ site.name }}.snippet.conf; include snippets/logging_{{ site.name }}.snippet.conf; - root /srv/www/c3woc.org; + root /srv/www/c3woc.de; location / { try_files $uri $uri/ =404; diff --git a/templates/files/nginx/sites/podcast.c3woc.de_tls.conf b/templates/files/nginx/sites/podcast.c3woc.de_tls.conf new file mode 100644 index 0000000..fdb700f --- /dev/null +++ b/templates/files/nginx/sites/podcast.c3woc.de_tls.conf @@ -0,0 +1,16 @@ +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + + server_name podcast.c3woc.de; + + 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/podcast.c3woc.de; + + location / { + try_files $uri $uri/ =404; + } +} diff --git a/templates/files/nginx/sites/podcast.c3woc.org_tls.conf b/templates/files/nginx/sites/podcast.c3woc.org_tls.conf new file mode 100644 index 0000000..9d97e68 --- /dev/null +++ b/templates/files/nginx/sites/podcast.c3woc.org_tls.conf @@ -0,0 +1,14 @@ +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + + server_name podcast.c3woc.org; + + 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.c3woc.de_tls.conf b/templates/files/nginx/sites/www.podcast.c3woc.de_tls.conf new file mode 100644 index 0000000..d32e2ba --- /dev/null +++ b/templates/files/nginx/sites/www.podcast.c3woc.de_tls.conf @@ -0,0 +1,14 @@ +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + + server_name www.podcast.c3woc.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.c3woc.org_tls.conf b/templates/files/nginx/sites/www.podcast.c3woc.org_tls.conf new file mode 100644 index 0000000..a0ba149 --- /dev/null +++ b/templates/files/nginx/sites/www.podcast.c3woc.org_tls.conf @@ -0,0 +1,14 @@ +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + + server_name www.podcast.c3woc.org; + + 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; + } +}