From e98c202be9446c4587e29c2179a2776abbca5c84 Mon Sep 17 00:00:00 2001
From: Sven Anders <sven@anders-hamburg.de>
Date: Mon, 21 Oct 2024 08:32:49 +0200
Subject: [PATCH 1/4] Kein Skype mehr, Repo geht nicht

---
 playbooks/setup-client.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/playbooks/setup-client.yml b/playbooks/setup-client.yml
index c9f74e32..b0b6f26d 100644
--- a/playbooks/setup-client.yml
+++ b/playbooks/setup-client.yml
@@ -9,7 +9,6 @@
     - jnv.unattended-upgrades
     - load_contacts
     - postfix_auth
-    - skype
     - fonts
     - xrdp
     - unburden_home_dir

From 42d4052ac0424e6f7d698987556cb7a76e69498c Mon Sep 17 00:00:00 2001
From: Sven Anders <sven@anders-hamburg.de>
Date: Mon, 21 Oct 2024 08:33:12 +0200
Subject: [PATCH 2/4] Neue Rocket Chat Version

---
 group_vars/tools_2023/chat.yml  | 4 ++--
 playbooks/tools-docker-only.yml | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 playbooks/tools-docker-only.yml

diff --git a/group_vars/tools_2023/chat.yml b/group_vars/tools_2023/chat.yml
index 9e85c60e..bded384d 100644
--- a/group_vars/tools_2023/chat.yml
+++ b/group_vars/tools_2023/chat.yml
@@ -1,8 +1,8 @@
-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_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
 
diff --git a/playbooks/tools-docker-only.yml b/playbooks/tools-docker-only.yml
new file mode 100644
index 00000000..173c16be
--- /dev/null
+++ b/playbooks/tools-docker-only.yml
@@ -0,0 +1,5 @@
+- name: Setup Tools new
+  hosts: tools_2023
+  gather_facts: true
+  roles:
+    - docker_compose_project

From cd989719072059ec124325f2031bc30ab020e905 Mon Sep 17 00:00:00 2001
From: Sven Anders <sven@anders-hamburg.de>
Date: Fri, 25 Oct 2024 10:22:38 +0200
Subject: [PATCH 3/4] Add tour2pdf

---
 group_vars/tools_2023/tour2pdf.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 group_vars/tools_2023/tour2pdf.yml

diff --git a/group_vars/tools_2023/tour2pdf.yml b/group_vars/tools_2023/tour2pdf.yml
new file mode 100644
index 00000000..76fdf7e1
--- /dev/null
+++ b/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"

From 4723a3e6ec2dfe1a4172a376d79dca88679fd1dd Mon Sep 17 00:00:00 2001
From: Sven Anders <sven@anders-hamburg.de>
Date: Fri, 25 Oct 2024 10:23:06 +0200
Subject: [PATCH 4/4] Rocketchat rework, with uploads seperate

---
 group_vars/tools_2023/chat.yml | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/group_vars/tools_2023/chat.yml b/group_vars/tools_2023/chat.yml
index 9e85c60e..36de9b5e 100644
--- a/group_vars/tools_2023/chat.yml
+++ b/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'