Merge branch 'master' into 2024-11-19-abrechnungsformular

group_vars/tools_2023/chat.yml

@@ -1,10 +1,10 @@
-rocketchat_test_version: 6.11.1
+rocketchat_test_version: 6.13.0
 rocketchat_test_root_url: https://chat-test.hamburg.adfc.de
-rocketchat_test_mongodb_version: 5.0
+rocketchat_test_mongodb_version: 6.0
 
-rocketchat_live_version: 6.11.1
+rocketchat_live_version: 6.13.0
 rocketchat_live_root_url: https://chat.hamburg.adfc.de
-rocketchat_live_mongodb_version: 5.0
+rocketchat_live_mongodb_version: 6.0
 
 docker_compose_project_rocketchat_test:
   nodes:
@@ -69,9 +69,13 @@ docker_compose_project_rocket:
   internal_port: 3000
   hetzner_volumes:
     - name: chat-mongo
-      size_gb: 20
+      size_gb: 30
       location: nbg1
       mount: /var/lib/docker/volumes/docker-rocket_mongodb_data
+    - name: chat-upload
+      size_gb: 20
+      location: nbg1
+      mount: /var/lib/docker/volumes/docker-rocket_rocket_uploads
   backup_on_new_version:
     - src: /var/lib/docker/volumes/docker-rocket_mongodb_data
       hcloud_volume_prefix: backup_chat_mongo
@@ -84,6 +88,8 @@ docker_compose_project_rocket:
     volumes:
       mongodb_data:
         driver: local
+      rocket_uploads:
+        driver: local
     services:
       rocketchat:
         image: registry.rocket.chat/rocketchat/rocket.chat:{{ rocketchat_live_version }}
@@ -101,6 +107,8 @@ docker_compose_project_rocket:
           - 3000
         ports:
           - "{{ adfc_internal_ip}}:3000:3000"
+        volumes:
+        - rocket_uploads:/app/uploads
       mongodb:
         image: docker.io/bitnami/mongodb:{{ rocketchat_live_mongodb_version }}
         restart: unless-stopped
@@ -115,3 +123,10 @@ docker_compose_project_rocket:
           MONGODB_ADVERTISED_HOSTNAME: mongodb
           MONGODB_ENABLE_JOURNAL: true
           ALLOW_EMPTY_PASSWORD: yes
+        # Wenn man von außen zugreifen will:
+        # ports:
+        # - 127.0.0.1:27017:27017
+        deploy:
+          resources:
+            limits:
+              cpus: '1.8'

group_vars/tools_2023/tour2pdf.yml

@@ -0,0 +1,27 @@
+docker_compose_project_tour2pdf:
+  nodes:
+    - tools1.hamburg.adfc.de
+    - tools2.hamburg.adfc.de
+  domains:
+    - tour2pdf.hamburg.adfc.de
+  internal_port: 4000
+  compose_block:
+    version: "3"
+    services:
+      tour2pdf:
+        restart: unless-stopped
+        image: ghcr.io/adfc-hamburg/tour2pdf
+        #environment:
+        ports:
+          - "{{ adfc_internal_ip}}:4000:8000"
+        labels:
+          - "com.centurylinklabs.watchtower.scope=tour2pdf"
+      watchtower:
+        image: containrrr/watchtower
+        volumes:
+          - /root/.docker/config.json:/config.json:ro
+          - /var/run/docker.sock:/var/run/docker.sock:ro
+          # pruefe alle 12h = 43200  1200 Sec auf update
+        command: --interval 43200 --debug --scope=tour2pdf docker-tour2pdf-tour2pdf-1
+        labels:
+          - "com.centurylinklabs.watchtower.scope=tour2pdf"

playbooks/setup-client.yml

@@ -9,7 +9,6 @@
     - jnv.unattended-upgrades
     - load_contacts
     - postfix_auth
-    - skype
     - fonts
     - xrdp
     - unburden_home_dir

playbooks/tools-docker-only.yml

@@ -0,0 +1,5 @@
+- name: Setup Tools new
+  hosts: tools_2023
+  gather_facts: true
+  roles:
+    - docker_compose_project