Merge branch 'master' of ssh://git.paulbsd.com:2222/paulbsd/paulbsd-salt

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:

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

states/nextcloud/init.sls

@@ -4,3 +4,4 @@ include:
   - redis
   - .install
   - .config
+  - php.service

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() %}

states/php/defaults.yaml

@@ -138,4 +138,3 @@ php:
       soap.wsdl_cache_limit: 5
     ldap:
       ldap.max_links: '-1'
-

states/rsyslog/defaults.yaml

@@ -0,0 +1,2 @@
+---
+rsyslog: {}