From 1a7e7b3851f35570fc136cd50736639fb610251e Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Fri, 28 Feb 2025 13:45:19 +0100
Subject: [PATCH] Solved path bug and optimized memcache

---
 group_vars/all/00_general.yml                       |  5 ++++-
 roles/docker-nextcloud/tasks/main.yml               |  2 +-
 .../templates/config/memcache.config.php.j2         | 13 +++++++++++++
 .../templates/config/redis.config.php.j2            | 11 -----------
 4 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 roles/docker-nextcloud/templates/config/memcache.config.php.j2
 delete mode 100644 roles/docker-nextcloud/templates/config/redis.config.php.j2

diff --git a/group_vars/all/00_general.yml b/group_vars/all/00_general.yml
index f0a623e1..081ecbc6 100644
--- a/group_vars/all/00_general.yml
+++ b/group_vars/all/00_general.yml
@@ -2,7 +2,10 @@
 pause_duration:         "120"         # Database delay to wait for the central database before continue tasks
 
 timezone:               "UTC"
-locale:                 "en"
+locale:                 "en"          # Some applications are case sensitive
+
+# Deployment mode
+deployment_mode:        "single"      # Use single, if you deploy on one server. Use cluster if you setup in cluster mode.
 
 ## Domain
 primary_domain_tld:     "localhost"                                     # Top Level Domain of the server
diff --git a/roles/docker-nextcloud/tasks/main.yml b/roles/docker-nextcloud/tasks/main.yml
index c837d1d5..31363948 100644
--- a/roles/docker-nextcloud/tasks/main.yml
+++ b/roles/docker-nextcloud/tasks/main.yml
@@ -12,7 +12,7 @@
 - name: "Create config files at {{ nextcloud_docker_config_additives_directory }}"
   template:
     src:    "{{ item }}"
-    dest:   "{{ nextcloud_docker_config_additives_directory }}/{{ item | basename | regex_replace('\\.j2$', '') }}"
+    dest:   "{{ nextcloud_host_config_additives_directory }}/{{ item | basename | regex_replace('\\.j2$', '') }}"
     owner:  "{{nextcloud_docker_user_id}}"
     group:  "{{nextcloud_docker_user_id}}"
   loop:     "{{ lookup('fileglob', role_path ~ '/templates/config/*.j2', wantlist=True) }}"
diff --git a/roles/docker-nextcloud/templates/config/memcache.config.php.j2 b/roles/docker-nextcloud/templates/config/memcache.config.php.j2
new file mode 100644
index 00000000..a5b0cc13
--- /dev/null
+++ b/roles/docker-nextcloud/templates/config/memcache.config.php.j2
@@ -0,0 +1,13 @@
+<?php
+
+# Implementing redis configuration
+return array (
+  # For single server setup APCu is recommended, for multi server setup Redis
+  'memcache.local' => '\\OC\\Memcache\\{% if deployment_mode == "single" %}APCu{% else %}Redis{% endif %}',
+  'memcache.locking' => '\\OC\\Memcache\\Redis',
+  'redis' =>
+  array (
+    'host' => 'redis',
+    'port' => 6379,
+  )
+);
diff --git a/roles/docker-nextcloud/templates/config/redis.config.php.j2 b/roles/docker-nextcloud/templates/config/redis.config.php.j2
deleted file mode 100644
index 0a94de63..00000000
--- a/roles/docker-nextcloud/templates/config/redis.config.php.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-# Implementing redis configuration
-return array (
-  'memcache.locking' => '\\OC\\Memcache\\Redis',
-  'redis' =>
-  array (
-    'host' => 'redis',
-    'port' => 6379,
-  )
-);