From 2ea62c3d31d3233e1e5e86cb2b741f3132f4e5b6 Mon Sep 17 00:00:00 2001
From: Niels Bouma <9073152+nielscil@users.noreply.github.com>
Date: Wed, 29 Mar 2023 12:29:01 +0200
Subject: [PATCH] Redo Nextcloud redis intergration

---
 group_vars/mash_servers | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/group_vars/mash_servers b/group_vars/mash_servers
index 90a767e..0799a57 100644
--- a/group_vars/mash_servers
+++ b/group_vars/mash_servers
@@ -730,23 +730,19 @@ nextcloud_base_path: "{{ mash_playbook_base_path }}/{{ mash_playbook_service_bas
 nextcloud_uid: "{{ mash_playbook_uid }}"
 nextcloud_gid: "{{ mash_playbook_gid }}"
 
-nextcloud_systemd_required_systemd_services_list: |
+nextcloud_systemd_required_services_list_auto: |
   {{
     (['docker.service'])
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and nextcloud_database_hostname == devture_postgres_identifier else [])
-    +
-    ([redis_identifier ~ '.service'] if redis_enabled and nextcloud_redis_enabled and nextcloud_redis_hostname == redis_identifier else [])
   }}
 
-nextcloud_container_additional_networks: |
+nextcloud_container_additional_networks_auto: |
   {{
     ( 
       ([mash_playbook_reverse_proxyable_services_additional_network] if mash_playbook_reverse_proxyable_services_additional_network else [])
       +
       ([devture_postgres_container_network] if devture_postgres_enabled and nextcloud_database_hostname == devture_postgres_identifier and nextcloud_container_network != devture_postgres_container_network else [])
-      +
-      ([redis_container_network] if redis_enabled and nextcloud_redis_enabled and nextcloud_redis_hostname == redis_identifier else [])
     ) | unique
   }}
 
@@ -760,9 +756,6 @@ nextcloud_database_port: "{{ '5432' if devture_postgres_enabled else '' }}"
 nextcloud_database_username: "nextcloud"
 nextcloud_database_password: "{{ '%s' | format(mash_playbook_generic_secret_key) | password_hash('sha512', 'db.nextcloud', rounds=655555) | to_uuid }}"
 
-nextcloud_redis_enabled: false
-nextcloud_redis_hostname: "{{ redis_identifier if redis_enabled and nextcloud_redis_enabled else '' }}"
-
 ########################################################################
 #                                                                      #
 # /nextcloud                                                           #