From 953c7242aa76b4c39a6ba2be86a1733779468415 Mon Sep 17 00:00:00 2001 From: Luca Friedrich Date: Thu, 11 Jan 2024 17:19:03 +0100 Subject: [PATCH 1/6] Add SSH keys of lucaf --- ssh_keys/lucaf/adfc-lf-scenic.pub | 1 + ssh_keys/lucaf/lf-yubikey.pub | 1 + 2 files changed, 2 insertions(+) create mode 100644 ssh_keys/lucaf/adfc-lf-scenic.pub create mode 100644 ssh_keys/lucaf/lf-yubikey.pub diff --git a/ssh_keys/lucaf/adfc-lf-scenic.pub b/ssh_keys/lucaf/adfc-lf-scenic.pub new file mode 100644 index 00000000..e959fb20 --- /dev/null +++ b/ssh_keys/lucaf/adfc-lf-scenic.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILXyt7YdDBeBdv/1P/hbjONHo1Gr/1x9cJ0EgfkIcpza lucaf@hamburg.adfc.de diff --git a/ssh_keys/lucaf/lf-yubikey.pub b/ssh_keys/lucaf/lf-yubikey.pub new file mode 100644 index 00000000..6e94b608 --- /dev/null +++ b/ssh_keys/lucaf/lf-yubikey.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrqmgHbl0b1XEXU6WGXG8tXQ7N3vzUnzohLRCnXaV4IdwlfL/9HvTtAUkULcDXPGGoFI0VHBL46IS9A/MujqoiOioyUoIF2do8tFBe3+L+fEEF0MAPXbr+11a/QDgGCeu+5jiz2O7kcALxAO8j/fPHDkZNzXPVpIhT0L1TDNIm/L8AMiA8Tm79iOlpck8xXO04WK41wS6ZloMrg1o60CwnVjyOPnM021TqkNnbIMtwXpY/OVYh+IdkYLQNae8Tw9a4mTzOmt+Hn2jQw8fzzS9rubP6/wRSYzD204aW5oj+clb/XHpE3yrQSSyeRXYADTP15kfWojTJ0KKyNpYlOPAp Yubikey-LF From 547c400fd7ff8253c4605d7f01671754ed402b8d Mon Sep 17 00:00:00 2001 From: Sven Anders Date: Sat, 13 Jan 2024 09:22:30 +0100 Subject: [PATCH 2/6] =?UTF-8?q?Lucas=20SSH=20Key=20hinzugef=C3=BCgt,=20Mar?= =?UTF-8?q?tin=20weg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- group_vars/all.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index c0ba1c78..bc9beba5 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -13,11 +13,11 @@ adfc_secret_folder: /etc/ansible/secrets/ adfc_vpnc_source: ucs-master.gst.hamburg.adfc.de adfc_borg_server: "{{ ansible_user + '@' + adfc_vpnc_source + ':/path/to/repo' }}" ssh_users_admins: - - svena - - volkerk - - martinw - georgs - johannesd + - lucaf + - svena + - volkerk # Paketverwaltung deb_name_master_pdf_editor: master-pdf-editor-5.7.60-qt5.x86_64.deb From b584cfc37a60e75dc8b78dfd6605932ad9a381a4 Mon Sep 17 00:00:00 2001 From: Sven Anders Date: Sat, 13 Jan 2024 09:23:15 +0100 Subject: [PATCH 3/6] =?UTF-8?q?Api=20mit=20PHP=20ausstatten=20f=C3=BCr=20S?= =?UTF-8?q?cripte?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- group_vars/tools_2023/api.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/group_vars/tools_2023/api.yml b/group_vars/tools_2023/api.yml index f2d6e41c..f1759499 100644 --- a/group_vars/tools_2023/api.yml +++ b/group_vars/tools_2023/api.yml @@ -1,6 +1,5 @@ docker_compose_project_api: nodes: - - tools1.hamburg.adfc.de - tools2.hamburg.adfc.de domains: - api.hamburg.adfc.de @@ -12,19 +11,19 @@ docker_compose_project_api: driver: local services: api: - image: nginx:mainline-alpine-slim + image: php:8.3-apache restart: unless-stopped ports: - "{{ adfc_internal_ip}}:3500:80" volumes: - - api_data:/usr/share/nginx/html:ro + - api_data:/var/www/html:rw labels: - "com.centurylinklabs.watchtower.scope=api" adfc_tour_to_vadb: image: ghcr.io/adfc-hamburg/adfc-tour_to_vadb restart: unless-stopped volumes: - - api_data:/srv/metroterm/out + - api_data:/srv/metroterm/out/ labels: - "com.centurylinklabs.watchtower.scope=api" watchtower: From 683e0ed12f14a7de1f70fed05a761534f3ba82e2 Mon Sep 17 00:00:00 2001 From: Sven Anders Date: Sat, 13 Jan 2024 09:23:42 +0100 Subject: [PATCH 4/6] Rocketchat Update auf 6.5.2 --- group_vars/tools_2023/chat.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group_vars/tools_2023/chat.yml b/group_vars/tools_2023/chat.yml index ba1e12ca..75711e8b 100644 --- a/group_vars/tools_2023/chat.yml +++ b/group_vars/tools_2023/chat.yml @@ -2,7 +2,7 @@ rocketchat_test_version: 6.4.6 rocketchat_test_root_url: https://chat-test-hamburg.adfc.de rocketchat_test_mongodb_version: 5.0 -rocketchat_live_version: 6.5.0 +rocketchat_live_version: 6.5.2 rocketchat_live_root_url: https://chat.hamburg.adfc.de rocketchat_live_mongodb_version: 5.0 From 2d4b2831fc3bd58287adef7726dfe6fca9055ef4 Mon Sep 17 00:00:00 2001 From: Sven Anders Date: Sat, 13 Jan 2024 09:24:05 +0100 Subject: [PATCH 5/6] Klara Test Domains, SSL Zert --- group_vars/loadbalancer.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/group_vars/loadbalancer.yml b/group_vars/loadbalancer.yml index 1e5da966..e51e4b02 100644 --- a/group_vars/loadbalancer.yml +++ b/group_vars/loadbalancer.yml @@ -11,6 +11,7 @@ haproxy_dehydrated_domains: - radverkehr.hamburg.adfc.de - t30antrag.hamburg.adfc.de - t30forderung.hamburg.adfc.de + - test2024.klara.bike - tresor.hamburg.adfc.de - web20.hamburg.adfc.de - wiki.hamburg.adfc.de @@ -18,6 +19,7 @@ haproxy_dehydrated_domains: - www.quartierefuermenschen.de - www.radreise-messe.de - www.xn--quartierefrmenschen-fbc.de + - www2024.klara.bike - xn--quartierefrmenschen-fbc.de dehydrated_deploy_hook: | From d9e23e3320412818fc4ade8734123cba87990487 Mon Sep 17 00:00:00 2001 From: Sven Anders Date: Sat, 13 Jan 2024 09:24:29 +0100 Subject: [PATCH 6/6] Johannes SSH Key entfernt --- group_vars/all.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index bc9beba5..9a9886e3 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -14,7 +14,6 @@ adfc_vpnc_source: ucs-master.gst.hamburg.adfc.de adfc_borg_server: "{{ ansible_user + '@' + adfc_vpnc_source + ':/path/to/repo' }}" ssh_users_admins: - georgs - - johannesd - lucaf - svena - volkerk