From 935c78d2b53a4e420ac616df11c584c1096fac7d Mon Sep 17 00:00:00 2001
From: L3D <l3d@c3woc.de>
Date: Wed, 13 Oct 2021 01:13:57 +0200
Subject: [PATCH] update gitea, delete WTF

---
 host_vars/web01.l3d.space/vars.yml                 |  7 ++-----
 roles/do1jlr.gitea                                 |  2 +-
 .../files/nginx/sites/wtf-kooperative.de_tls.conf  | 14 --------------
 .../nginx/sites/www.wtf-kooperative.de_tls.conf    | 14 --------------
 4 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 templates/files/nginx/sites/wtf-kooperative.de_tls.conf
 delete mode 100644 templates/files/nginx/sites/www.wtf-kooperative.de_tls.conf

diff --git a/host_vars/web01.l3d.space/vars.yml b/host_vars/web01.l3d.space/vars.yml
index f919fe8..f1bf736 100644
--- a/host_vars/web01.l3d.space/vars.yml
+++ b/host_vars/web01.l3d.space/vars.yml
@@ -45,7 +45,6 @@ sshd__allowed_users:
   - "webwaffel"
   - "webwaffelpodcast"
   - "gitea"
-  - "wtfpreview"
   - "files"
   - "preview"
 
@@ -56,7 +55,6 @@ sshd__allowed_groups:
   - "webwaffel"
   - "webwaffelpodcast"
   - "gitea"
-  - "wtfpreview"
   - "files"
   - "preview"
 
@@ -64,10 +62,11 @@ accounts:
   - 'l3d'
   - 'webwaffel'
   - 'webwaffelpodcast'
-  - 'wtfpreview'
   - "files"
   - "preview"
 
+acme_domain_unwant_list: []
+
 nginx_sites:
   - name: 'c3woc.de'
     webroot:
@@ -120,8 +119,6 @@ nginx_sites:
   - name: 'www.c3nom.de'
   - name: 'c3doc.de'
   - name: 'www.c3doc.de'
-  - name: 'wtf-kooperative.de'
-  - name: 'www.wtf-kooperative.de'
   - name: 'files.l3d.ch'
     webroot:
       user: 'files'
diff --git a/roles/do1jlr.gitea b/roles/do1jlr.gitea
index e353634..6a29a8d 160000
--- a/roles/do1jlr.gitea
+++ b/roles/do1jlr.gitea
@@ -1 +1 @@
-Subproject commit e3536340f49b8c3f80d511bd1a0d155b4462b7f4
+Subproject commit 6a29a8d0282ad55ab8fd936d2d5145e615d77a95
diff --git a/templates/files/nginx/sites/wtf-kooperative.de_tls.conf b/templates/files/nginx/sites/wtf-kooperative.de_tls.conf
deleted file mode 100644
index 33a152d..0000000
--- a/templates/files/nginx/sites/wtf-kooperative.de_tls.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-server {
-        listen 443 ssl http2;
-        listen [::]:443 ssl http2;
-
-        server_name 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://wtf-eg.de$request_uri;
-        }
-}
diff --git a/templates/files/nginx/sites/www.wtf-kooperative.de_tls.conf b/templates/files/nginx/sites/www.wtf-kooperative.de_tls.conf
deleted file mode 100644
index c538a01..0000000
--- a/templates/files/nginx/sites/www.wtf-kooperative.de_tls.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-server {
-        listen 443 ssl http2;
-        listen [::]:443 ssl http2;
-
-        server_name www.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://wtf-kooperative.de$request_uri;
-        }
-}