From f6c6e6f42f3a7c926f4cc95438b34b7f9d2c58b9 Mon Sep 17 00:00:00 2001
From: Actaeus Curabitur <actcur@actcur.com>
Date: Thu, 1 Sep 2022 10:38:14 -0500
Subject: [PATCH] a

---
 states/roles/maintain/nextcloud/init.sls         | 16 ++++++++++------
 .../maintain/nextcloud/php-fpm-nextcloud.conf    |  2 +-
 .../maintain/nextcloud/php-fpm-override.conf     |  1 +
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/states/roles/maintain/nextcloud/init.sls b/states/roles/maintain/nextcloud/init.sls
index 554ed3f..4818c3a 100644
--- a/states/roles/maintain/nextcloud/init.sls
+++ b/states/roles/maintain/nextcloud/init.sls
@@ -28,6 +28,12 @@ nextcloud-pkgs:
     - mode: 755
     - makedirs: true
 
+nginx-service:
+  service.running:
+    - name: nginx
+    - watch:
+      - file: /etc/nginx/conf.d/nextcloud.conf
+
 nextcloud-nginx-confd:
   file.directory:
     - name: /etc/nginx/conf.d/
@@ -122,6 +128,10 @@ nextcloud-php-fpm:
     - group: root
     - mode: 644
 
+nextcloud-cron.timer:
+  service.running:
+    - enable: true
+
 /var/lib/nextcloud/data/.ocdata:
   file.managed:
     - user: nextcloud
@@ -134,12 +144,6 @@ nextcloud-php-fpm:
 #    - addusers:
 #      - http
 
-nginx-service:
-  service.running:
-    - name: nginx
-    - watch:
-      - file: /etc/nginx/conf.d/nextcloud.conf
-
 #/usr/share/webapps/nextcloud/apps:
 #  file.directory:
 #    - user: root
diff --git a/states/roles/maintain/nextcloud/php-fpm-nextcloud.conf b/states/roles/maintain/nextcloud/php-fpm-nextcloud.conf
index 8e43530..9134213 100644
--- a/states/roles/maintain/nextcloud/php-fpm-nextcloud.conf
+++ b/states/roles/maintain/nextcloud/php-fpm-nextcloud.conf
@@ -467,7 +467,7 @@ env[TEMP] = /tmp
 
 php_value[date.timezone] = America/Chicago
 
-php_value[open_basedir] = /var/lib/$pool:/tmp:/usr/share/webapps/$pool:/etc/webapps/$pool:/dev/urandom:/usr/lib/php/modules:/var/log/$pool:/proc/meminfo
+php_value[open_basedir] = /mnt/$pool:/var/lib/$pool:/tmp:/usr/share/webapps/$pool:/etc/webapps/$pool:/dev/urandom:/usr/lib/php/modules:/var/log/$pool:/proc/meminfo
 
 ; put session data in dedicated directory
 php_value[session.save_path] = /var/lib/$pool/sessions
diff --git a/states/roles/maintain/nextcloud/php-fpm-override.conf b/states/roles/maintain/nextcloud/php-fpm-override.conf
index 5e609a6..306fa5b 100644
--- a/states/roles/maintain/nextcloud/php-fpm-override.conf
+++ b/states/roles/maintain/nextcloud/php-fpm-override.conf
@@ -3,3 +3,4 @@ ExecStart=
 ExecStart=/usr/bin/php-fpm --nodaemonize --fpm-config /etc/php/php-fpm.conf --php-ini /etc/php/php-fpm.ini
 ReadWritePaths=/var/lib/nextcloud
 ReadWritePaths=/etc/webapps/nextcloud/config
+ReadWritePaths=/mnt/nextcloud