From ecd250304eb759fac5a70bf67a5d09bcd9838067 Mon Sep 17 00:00:00 2001
From: Paul Lecuq <paul@paulbsd.com>
Date: Wed, 17 Nov 2021 22:57:15 +0100
Subject: [PATCH] updated nextcloud state

---
 states/nextcloud/config.sls              | 2 ++
 states/nextcloud/defaults.yaml           | 8 ++++----
 states/nextcloud/init.sls                | 1 +
 states/nextcloud/templates/config.php.j2 | 1 -
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/states/nextcloud/config.sls b/states/nextcloud/config.sls
index d117f71..7a6e9ac 100644
--- a/states/nextcloud/config.sls
+++ b/states/nextcloud/config.sls
@@ -8,6 +8,8 @@ nextcloud-config:
     - user: {{ nextcloud.user }}
     - group: {{ nextcloud.group }}
     - template: jinja
+    - context:
+        nextcloud: {{ nextcloud }}
 
 nextcloud-upgrade:
   cmd.run:
diff --git a/states/nextcloud/defaults.yaml b/states/nextcloud/defaults.yaml
index deae7c8..b70087e 100644
--- a/states/nextcloud/defaults.yaml
+++ b/states/nextcloud/defaults.yaml
@@ -51,7 +51,8 @@ nextcloud:
     logtimezone: 'Europe/Paris'
     log_query: false
     maintenance: false
-    memcache.local: '\\OC\\Memcache\\Redis'
+    memcache.local: '\OC\Memcache\Redis'
+    memcache.locking: '\OC\Memcache\Redis'
     redis:
       - host: localhost
         port: 6379
@@ -68,10 +69,9 @@ nextcloud:
       - '198.51.100.128'
       - '192.168.2.0/24'
     forwarded_for_headers:
-      - HTTP_X_FORWARDED
-      - HTTP_FORWARDED_FOR
+      - 'HTTP_X_FORWARDED'
+      - 'HTTP_FORWARDED_FOR'
     max_filesize_animated_gifs_public_sharing: 10
     filelocking.enabled: true
-    memcache.locking: '\\OC\\Memcache\\Redis'
     filelocking.debug: false
     upgrade.disable-web: false
diff --git a/states/nextcloud/init.sls b/states/nextcloud/init.sls
index 07b0c86..a2a4fe7 100644
--- a/states/nextcloud/init.sls
+++ b/states/nextcloud/init.sls
@@ -4,3 +4,4 @@ include:
   - redis
   - .install
   - .config
+  - php.service
diff --git a/states/nextcloud/templates/config.php.j2 b/states/nextcloud/templates/config.php.j2
index d6c56c8..0bd7bc4 100644
--- a/states/nextcloud/templates/config.php.j2
+++ b/states/nextcloud/templates/config.php.j2
@@ -1,5 +1,4 @@
 <?php
-{%- from "nextcloud/map.jinja" import nextcloud with context %}
 {%- macro mac(value,last) -%}
 {%- if value is mapping %}
 {%- for k, v in value.items() %}