diff --git a/host_vars/web01.l3d.space.yml b/host_vars/web01.l3d.space.yml index 5cc0158..a65343d 100644 --- a/host_vars/web01.l3d.space.yml +++ b/host_vars/web01.l3d.space.yml @@ -21,9 +21,11 @@ accounts: - webwaffel nginx_sites: - - name: 'c3woc.org' + - name: 'c3woc.de' webroot: user: 'webwaffel' + - name: 'www.c3woc.de' + - name: 'c3woc.org' - name: 'www.c3woc.org' - name: 'c3woc.eu' - name: 'www.c3woc.eu' diff --git a/templates/files/nginx/sites/c3woc.cn_tls.conf b/templates/files/nginx/sites/c3woc.cn_tls.conf index 60734a6..cee41ac 100644 --- a/templates/files/nginx/sites/c3woc.cn_tls.conf +++ b/templates/files/nginx/sites/c3woc.cn_tls.conf @@ -9,6 +9,6 @@ server { include snippets/logging_{{ site.name }}.snippet.conf; location / { - return 308 https://c3woc.org$request_uri; + return 308 https://c3woc.de$request_uri; } } diff --git a/templates/files/nginx/sites/c3woc.de_tls.conf b/templates/files/nginx/sites/c3woc.de_tls.conf new file mode 100644 index 0000000..b02a020 --- /dev/null +++ b/templates/files/nginx/sites/c3woc.de_tls.conf @@ -0,0 +1,16 @@ +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + + server_name 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/c3woc.org; + + location / { + try_files $uri $uri/ =404; + } +} diff --git a/templates/files/nginx/sites/c3woc.eu_tls.conf b/templates/files/nginx/sites/c3woc.eu_tls.conf index 2062fdd..50dc0c5 100644 --- a/templates/files/nginx/sites/c3woc.eu_tls.conf +++ b/templates/files/nginx/sites/c3woc.eu_tls.conf @@ -9,6 +9,6 @@ server { include snippets/logging_{{ site.name }}.snippet.conf; location / { - return 308 https://c3woc.org$request_uri; + return 308 https://c3woc.de$request_uri; } } diff --git a/templates/files/nginx/sites/c3woc.org_tls.conf b/templates/files/nginx/sites/c3woc.org_tls.conf index 4549453..a420b69 100644 --- a/templates/files/nginx/sites/c3woc.org_tls.conf +++ b/templates/files/nginx/sites/c3woc.org_tls.conf @@ -8,9 +8,7 @@ server { include snippets/tls_certificate_{{ site.name }}.snippet.conf; include snippets/logging_{{ site.name }}.snippet.conf; - root /srv/www/c3woc.org; - location / { - try_files $uri $uri/ =404; + return 308 https://c3woc.de$request_uri; } } diff --git a/templates/files/nginx/sites/www.c3woc.cn_tls.conf b/templates/files/nginx/sites/www.c3woc.cn_tls.conf index 2565586..37187bc 100644 --- a/templates/files/nginx/sites/www.c3woc.cn_tls.conf +++ b/templates/files/nginx/sites/www.c3woc.cn_tls.conf @@ -9,6 +9,6 @@ server { include snippets/logging_{{ site.name }}.snippet.conf; location / { - return 308 https://c3woc.org$request_uri; + return 308 https://c3woc.de$request_uri; } } diff --git a/templates/files/nginx/sites/www.c3woc.de_tls.conf b/templates/files/nginx/sites/www.c3woc.de_tls.conf new file mode 100644 index 0000000..222aa95 --- /dev/null +++ b/templates/files/nginx/sites/www.c3woc.de_tls.conf @@ -0,0 +1,14 @@ +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + + server_name www.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://c3woc.de$request_uri; + } +} diff --git a/templates/files/nginx/sites/www.c3woc.eu_tls.conf b/templates/files/nginx/sites/www.c3woc.eu_tls.conf index 117a2b9..7f42cb2 100644 --- a/templates/files/nginx/sites/www.c3woc.eu_tls.conf +++ b/templates/files/nginx/sites/www.c3woc.eu_tls.conf @@ -9,6 +9,6 @@ server { include snippets/logging_{{ site.name }}.snippet.conf; location / { - return 308 https://c3woc.eu$request_uri; + return 308 https://c3woc.de$request_uri; } } diff --git a/templates/files/nginx/sites/www.c3woc.org_tls.conf b/templates/files/nginx/sites/www.c3woc.org_tls.conf index d5f0100..b4699d1 100644 --- a/templates/files/nginx/sites/www.c3woc.org_tls.conf +++ b/templates/files/nginx/sites/www.c3woc.org_tls.conf @@ -9,6 +9,6 @@ server { include snippets/logging_{{ site.name }}.snippet.conf; location / { - return 308 https://c3woc.org$request_uri; + return 308 https://c3woc.de$request_uri; } }