Merge branch 'master' into loadbalancer01

ADFC-Hamburg · Jan 22, 2024 · 1468e37 · 1468e37
2 parents 2f3ff97 + bd32b46
commit 1468e37
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/group_vars/all.yml b/group_vars/all.yml
@@ -13,11 +13,10 @@ 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:
+  - georgs
+  - lucaf
   - svena
   - volkerk
-  - martinw
-  - georgs
-  - johannesd
 
 # Paketverwaltung
 deb_name_master_pdf_editor: master-pdf-editor-5.7.60-qt5.x86_64.deb

diff --git a/group_vars/loadbalancer.yml b/group_vars/loadbalancer.yml
@@ -12,6 +12,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
@@ -20,6 +21,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: |

diff --git 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:

diff --git 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
 

diff --git a/ssh_keys/lucaf/adfc-lf-scenic.pub 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
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrqmgHbl0b1XEXU6WGXG8tXQ7N3vzUnzohLRCnXaV4IdwlfL/9HvTtAUkULcDXPGGoFI0VHBL46IS9A/MujqoiOioyUoIF2do8tFBe3+L+fEEF0MAPXbr+11a/QDgGCeu+5jiz2O7kcALxAO8j/fPHDkZNzXPVpIhT0L1TDNIm/L8AMiA8Tm79iOlpck8xXO04WK41wS6ZloMrg1o60CwnVjyOPnM021TqkNnbIMtwXpY/OVYh+IdkYLQNae8Tw9a4mTzOmt+Hn2jQw8fzzS9rubP6/wRSYzD204aW5oj+clb/XHpE3yrQSSyeRXYADTP15kfWojTJ0KKyNpYlOPAp Yubikey-LF
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILXyt7YdDBeBdv/1P/hbjONHo1Gr/1x9cJ0EgfkIcpza lucaf@hamburg.adfc.de
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrqmgHbl0b1XEXU6WGXG8tXQ7N3vzUnzohLRCnXaV4IdwlfL/9HvTtAUkULcDXPGGoFI0VHBL46IS9A/MujqoiOioyUoIF2do8tFBe3+L+fEEF0MAPXbr+11a/QDgGCeu+5jiz2O7kcALxAO8j/fPHDkZNzXPVpIhT0L1TDNIm/L8AMiA8Tm79iOlpck8xXO04WK41wS6ZloMrg1o60CwnVjyOPnM021TqkNnbIMtwXpY/OVYh+IdkYLQNae8Tw9a4mTzOmt+Hn2jQw8fzzS9rubP6/wRSYzD204aW5oj+clb/XHpE3yrQSSyeRXYADTP15kfWojTJ0KKyNpYlOPAp Yubikey-LF