From fca9ebae5dd1a18a4dbe1f717c82651c2fc5ea49 Mon Sep 17 00:00:00 2001 From: L3D Date: Tue, 28 Nov 2023 03:19:27 +0100 Subject: [PATCH] update ntp, remove backwesen --- ansible.cfg | 1 - collections/ansible_collections/l3d/git | 2 +- files/git.l3d.ch/gitea_logo/logo.svg | 2002 +++++++++++++---- host_vars/web01.l3d.space/vars.yml | 6 +- requirements.txt | 6 + roles/do1jlr.ntp | 2 +- .../files/nginx/sites/backwesen.de_tls.conf | 14 - .../nginx/sites/www.backwesen.de_tls.conf | 14 - 8 files changed, 1546 insertions(+), 501 deletions(-) delete mode 100644 templates/files/nginx/sites/backwesen.de_tls.conf delete mode 100644 templates/files/nginx/sites/www.backwesen.de_tls.conf diff --git a/ansible.cfg b/ansible.cfg index 0457378..16bb31c 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -10,7 +10,6 @@ forks = 20 gathering = smart fact_caching = jsonfile fact_caching_connection = $HOME/.ansible/facts -host_key_checking = false interpreter_python = /usr/bin/python3 diff --git a/collections/ansible_collections/l3d/git b/collections/ansible_collections/l3d/git index 87a6b92..f9f568e 160000 --- a/collections/ansible_collections/l3d/git +++ b/collections/ansible_collections/l3d/git @@ -1 +1 @@ -Subproject commit 87a6b92a09a9bf1f064a38f0b51ae32cae21b431 +Subproject commit f9f568e4cdb190c1e14e5ec67b1eca5df89217cf diff --git a/files/git.l3d.ch/gitea_logo/logo.svg b/files/git.l3d.ch/gitea_logo/logo.svg index 24f301e..4f48c3e 100644 --- a/files/git.l3d.ch/gitea_logo/logo.svg +++ b/files/git.l3d.ch/gitea_logo/logo.svg @@ -1,472 +1,1540 @@ - - Backwesen LOGO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Backwesen LOGO - - - L3D <l3d@c3woc.de> - - - - - - backwesen.de - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + git.l3d.ch logo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + git.l3d.ch logo + + + L3D <l3d@c3woc.de> + + + + + + git.l3d.ch + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - diff --git a/host_vars/web01.l3d.space/vars.yml b/host_vars/web01.l3d.space/vars.yml index 53b29c3..31cd92b 100644 --- a/host_vars/web01.l3d.space/vars.yml +++ b/host_vars/web01.l3d.space/vars.yml @@ -114,7 +114,9 @@ acme_reload_services: acme_restart_services: - 'gitea' -acme_domain_unwant_list: [] +acme_domain_unwant_list: + - name: 'backwesen.de' + - name: 'www.backwesen.de' # - name: 'example.com' nginx_sites: @@ -162,8 +164,6 @@ nginx_sites: - name: 'www.angel.systems' - name: 'einhornsystem.de' - name: 'www.einhornsystem.de' - - name: 'backwesen.de' - - name: 'www.backwesen.de' - name: 'git.l3d.ch' - name: 'www.git.l3d.ch' - name: 'files.l3d.ch' diff --git a/requirements.txt b/requirements.txt index da63411..883f266 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,8 @@ jmespath>=1.0.1 passlib[bcrypt]>=1.7.4 +ansible +ansible-core >= 2.16.0 +ansible-lint +yamllint +j2lint +netaddr >= 0.9.0 diff --git a/roles/do1jlr.ntp b/roles/do1jlr.ntp index a3ac34e..09864d0 160000 --- a/roles/do1jlr.ntp +++ b/roles/do1jlr.ntp @@ -1 +1 @@ -Subproject commit a3ac34e33dda8a0d5633ee8bb111aea6ddf62a90 +Subproject commit 09864d03a24a4ba3049e4825c3e045295ed2a670 diff --git a/templates/files/nginx/sites/backwesen.de_tls.conf b/templates/files/nginx/sites/backwesen.de_tls.conf deleted file mode 100644 index e8c1cd8..0000000 --- a/templates/files/nginx/sites/backwesen.de_tls.conf +++ /dev/null @@ -1,14 +0,0 @@ -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - - server_name backwesen.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 301 https://git.l3d.ch$request_uri; - } -} diff --git a/templates/files/nginx/sites/www.backwesen.de_tls.conf b/templates/files/nginx/sites/www.backwesen.de_tls.conf deleted file mode 100644 index 83fa016..0000000 --- a/templates/files/nginx/sites/www.backwesen.de_tls.conf +++ /dev/null @@ -1,14 +0,0 @@ -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - - server_name www.backwesen.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 301 https://git.l3d.ch/$request_uri; - } -}