From daaac805e93d5a22443e5db24e162927739ade91 Mon Sep 17 00:00:00 2001
From: Sheppy <sheppy@atlantishq.de>
Date: Wed, 17 Jul 2024 12:34:14 +0000
Subject: [PATCH] update: various docker upgrades & debian 12 bookworm

---
 get-os-version.yaml                           | 46 +++++++++++++++++++
 roles/docker-deployments/tasks/main.yaml      | 10 ++--
 .../templates/hedgedoc.yaml                   |  2 +-
 roles/openvpn/tasks/main.yaml                 |  2 +-
 roles/usermanagement/tasks/keycloak.yaml      |  2 +-
 roles/usermanagement/templates/keycloak.yaml  |  2 +-
 6 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 get-os-version.yaml

diff --git a/get-os-version.yaml b/get-os-version.yaml
new file mode 100644
index 0000000..f961ecb
--- /dev/null
+++ b/get-os-version.yaml
@@ -0,0 +1,46 @@
+---
+- hosts: all
+  gather_facts: yes
+  become: false
+  tasks:
+
+  - name: Distribution major version
+    debug:
+        msg: "{{ ansible_distribution_major_version }}"
+
+#  - name: Upgrade
+#    block:
+#
+#      - name: Update apt repo and cache on all Debian/Ubuntu boxes
+#        apt:
+#          update_cache: yes
+#          force_apt_get: yes
+#          cache_valid_time: 0
+#
+#      - name: Prepare. Autoremove old packages
+#        apt:
+#          autoremove: true
+#          autoclean: true
+#
+#      - name: Update sources
+#        shell:
+#            cmd: |
+#                sed -i 's/bullseye/bookworm/g' /etc/apt/sources.list
+#
+#      - name: Update apt repo and cache on all Debian/Ubuntu boxes
+#        apt:
+#          update_cache: yes
+#          force_apt_get: yes
+#          cache_valid_time: 0
+#
+#      - name: Upgrade all packages on servers
+#        apt:
+#          upgrade: dist
+#          force_apt_get: yes
+#
+#      - name: Prepare. Autoremove old packages
+#        apt:
+#          autoremove: true
+#          autoclean: true
+#
+#    when: ansible_distribution_major_version == "11"
diff --git a/roles/docker-deployments/tasks/main.yaml b/roles/docker-deployments/tasks/main.yaml
index 752f945..532e010 100644
--- a/roles/docker-deployments/tasks/main.yaml
+++ b/roles/docker-deployments/tasks/main.yaml
@@ -169,10 +169,10 @@
     - atlantis-verify
     - soundlib-interface
     - python-flask-picture-factory
-    - money-balancer
+    #- money-balancer
     - atlantis-web-check
     - ntfy
-    - ferchau-wscad
+    #- ferchau-wscad
     - code-server
 
 - name: OAuth2Proxy directories
@@ -214,9 +214,9 @@
     - ferchau-wscad
 
 - name: Deploy OAuth2Proxy
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: /opt/oauth2proxy/{{ item }}/
-    pull: true
+    pull: always
   with_items:
     - tmnf-replay-server
     - atlantis-hub
@@ -226,6 +226,6 @@
     - soundlib-interface
     - python-flask-picture-factory
     #- reactive-resume
-    - money-balancer
+    #- money-balancer
     - atlantis-web-check
     - ferchau-wscad
diff --git a/roles/docker-deployments/templates/hedgedoc.yaml b/roles/docker-deployments/templates/hedgedoc.yaml
index 64118f7..48984e9 100644
--- a/roles/docker-deployments/templates/hedgedoc.yaml
+++ b/roles/docker-deployments/templates/hedgedoc.yaml
@@ -10,7 +10,7 @@ services:
     restart: always
   app:
     # Make sure to use the latest release from https://hedgedoc.org/latest-release
-    image: quay.io/hedgedoc/hedgedoc:1.9.9
+    image: quay.io/hedgedoc/hedgedoc:latest
     environment:
       - CMD_DB_URL=postgres://hedgedoc:HISTORY_PURGED_SECRET@database:5432/hedgedoc
       - CMD_DOMAIN=hedgedoc.atlantishq.de
diff --git a/roles/openvpn/tasks/main.yaml b/roles/openvpn/tasks/main.yaml
index 68bac39..895b20b 100644
--- a/roles/openvpn/tasks/main.yaml
+++ b/roles/openvpn/tasks/main.yaml
@@ -15,7 +15,7 @@
 - name: Deploy OpenVPN configs
   template:
     src: "{{ item }}.conf"
-    dest: "/etc/openvpn/{{ item }}-{{ item.dev_type }}/{{ item }}-{{ item.dev_type }}.conf"
+    dest: "/etc/openvpn/{{ item.name }}-{{ item.dev_type }}/{{ item.name }}-{{ item.dev_type }}.conf"
   with_items:
     - { "name" : "atlantishq", "dev_type" : "tap", "port" : 7012 }
     - { "name" : "atlantishq", "dev_type" : "tun", "port" : 7013 }
diff --git a/roles/usermanagement/tasks/keycloak.yaml b/roles/usermanagement/tasks/keycloak.yaml
index a231cbc..d8f58dc 100644
--- a/roles/usermanagement/tasks/keycloak.yaml
+++ b/roles/usermanagement/tasks/keycloak.yaml
@@ -40,7 +40,7 @@
 
 - name: Check/Wait for Keycloak to be up
   uri:
-    url: https://keycloak.atlantishq.de/health
+    url: https://keycloak.atlantishq.de/
     method: GET
     return_content: yes
     status_code: 200
diff --git a/roles/usermanagement/templates/keycloak.yaml b/roles/usermanagement/templates/keycloak.yaml
index bbc374c..b31034a 100644
--- a/roles/usermanagement/templates/keycloak.yaml
+++ b/roles/usermanagement/templates/keycloak.yaml
@@ -6,7 +6,7 @@ services:
   keycloak:
     container_name: keycloak-container
     command: start --hostname-strict=false --log-level=WARNING
-    image: quay.io/keycloak/keycloak:23.0.3
+    image: quay.io/keycloak/keycloak:latest
     environment:
       - KEYCLOAK_ADMIN=admin
       - KEYCLOAK_ADMIN_PASSWORD={{ keycloak_admin_password }}