From ec5f88fc34ad01d272ced915e73bb104f61f33fd Mon Sep 17 00:00:00 2001 From: L3D Date: Tue, 5 Oct 2021 01:15:15 +0200 Subject: [PATCH] update web stuff --- host_vars/web01.l3d.space/vars.yml | 11 ----------- roles/do1jlr.mysql | 2 +- roles/do1jlr.nginx | 2 +- .../sites/preview.wtf-kooperative.de_tls.conf | 16 ---------------- .../www.preview.wtf-kooperative.de_tls.conf | 14 -------------- 5 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 templates/files/nginx/sites/preview.wtf-kooperative.de_tls.conf delete mode 100644 templates/files/nginx/sites/www.preview.wtf-kooperative.de_tls.conf diff --git a/host_vars/web01.l3d.space/vars.yml b/host_vars/web01.l3d.space/vars.yml index 0791512..c3c8dd5 100644 --- a/host_vars/web01.l3d.space/vars.yml +++ b/host_vars/web01.l3d.space/vars.yml @@ -22,13 +22,6 @@ users: - l3d@derpy.l3d.yt - l3d@backup-rsa.l3d.yt - l3d@business.wingcon.com - wtfpreview: - - 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 files: - l3d@pinkie.l3d.yt - l3d@mobile.l3d.yt @@ -129,10 +122,6 @@ nginx_sites: - name: 'www.c3doc.de' - name: 'wtf-kooperative.de' - name: 'www.wtf-kooperative.de' - - name: 'preview.wtf-kooperative.de' - webroot: - user: 'wtfpreview' - - name: 'www.preview.wtf-kooperative.de' - name: 'files.l3d.ch' webroot: user: 'files' diff --git a/roles/do1jlr.mysql b/roles/do1jlr.mysql index 1830d94..32633db 160000 --- a/roles/do1jlr.mysql +++ b/roles/do1jlr.mysql @@ -1 +1 @@ -Subproject commit 1830d94f0a41254614f61b1f6ec000bc14cd5ce1 +Subproject commit 32633db075c8e9301895944dacaf843712f841c7 diff --git a/roles/do1jlr.nginx b/roles/do1jlr.nginx index 6adbdcc..06c49a0 160000 --- a/roles/do1jlr.nginx +++ b/roles/do1jlr.nginx @@ -1 +1 @@ -Subproject commit 6adbdcc21f8f403e616c7b1a2d853ef0a186e19b +Subproject commit 06c49a000d480c2ff0a5094bb36a4bfed64ca56d diff --git a/templates/files/nginx/sites/preview.wtf-kooperative.de_tls.conf b/templates/files/nginx/sites/preview.wtf-kooperative.de_tls.conf deleted file mode 100644 index dac79b6..0000000 --- a/templates/files/nginx/sites/preview.wtf-kooperative.de_tls.conf +++ /dev/null @@ -1,16 +0,0 @@ -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - - server_name preview.wtf-kooperative.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/preview.wtf-kooperative.de; - - location / { - try_files $uri $uri/ =404; - } -} diff --git a/templates/files/nginx/sites/www.preview.wtf-kooperative.de_tls.conf b/templates/files/nginx/sites/www.preview.wtf-kooperative.de_tls.conf deleted file mode 100644 index cf36603..0000000 --- a/templates/files/nginx/sites/www.preview.wtf-kooperative.de_tls.conf +++ /dev/null @@ -1,14 +0,0 @@ -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - - server_name www.preview.wtf-kooperative.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://preview.wtf-kooperative.de$request_uri; - } -}