From a7d3ae2f3e827f280c51caabb29f421266b07f4e Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 12 Jan 2019 02:09:45 +0100
Subject: elevate/media: minor cleanup and fixes

---
 roles/elevate/media/tasks/nextcloud-config.yml          |  7 ++++---
 roles/elevate/media/tasks/nextcloud.yml                 | 16 ++++++++++++++--
 roles/elevate/media/templates/nextcloud-cron.service.j2 |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/roles/elevate/media/tasks/nextcloud-config.yml b/roles/elevate/media/tasks/nextcloud-config.yml
index 1ce80860..67bb0cec 100644
--- a/roles/elevate/media/tasks/nextcloud-config.yml
+++ b/roles/elevate/media/tasks/nextcloud-config.yml
@@ -34,9 +34,6 @@
   set_fact:
     nextcloud_files_external_list: "{{ nextcloud_files_external_list.stdout | from_json }}"
 
-- debug:
-    var: nextcloud_files_external_list
-
 - name: configure external storage in nextcloud
   command: docker exec -u www-data nextcloud.service /var/www/html/occ files_external:create -n --output=json --config="datadir=/srv/external" Fileserver local null::null
   when: not (nextcloud_files_external_list | nextcloud_mountpoint_exists('/Fileserver'))
@@ -46,6 +43,10 @@
   command: docker exec -u www-data nextcloud.service /var/www/html/occ files_external:applicable -n --output=json 1 --add-group=elevate
   changed_when: false
 
+  ## TODO: this is idempotent but flagging change would be nice
+- name: set up background tasks trigger to cron
+  command: docker exec -u www-data nextcloud.service /var/www/html/occ background:cron
+  changed_when: false
 
 ### add this until tests have been done
 ## 'overwriteprotocol' => 'http',   ->  /srv/nextcloud/config/nextcloud/config.php
diff --git a/roles/elevate/media/tasks/nextcloud.yml b/roles/elevate/media/tasks/nextcloud.yml
index d827a28a..44bdfd6d 100644
--- a/roles/elevate/media/tasks/nextcloud.yml
+++ b/roles/elevate/media/tasks/nextcloud.yml
@@ -32,6 +32,17 @@
     state: present
 
 
+## to purge exisiting installation run the following commands (!!! will delete all data and the DB !!!):
+#
+# systemctl disable nextcloud-cron.timer
+# systemctl stop nextcloud-cron.timer
+# systemctl disable nextcloud.serivce
+# systemctl stop nextcloud.service
+# rm -rf /srv/nextcloud/config/nextcloud
+# rm -rf /srv/ncdata/nextcloud
+# rm -rf /srv/nextcloud/www
+# echo "drop database nextcloud;" | mysql --defaults-extra-file=/etc/mysql/debian.cnf
+#
 - name: check if nextcloud is already configured
   stat:
     path: /srv/nextcloud/config/nextcloud/config.php
@@ -42,7 +53,9 @@
   docker_container:
     name: nextcloud
     image: nextcloud:{{ nextcloud_version }}-fpm
-    command: /bin/true
+    ## for some reasons a newly created database schema is not up to date with the recommended settings...
+    ## in case this is not needed anymore using '/bin/true' here.
+    command: 'su -p www-data -s /bin/sh -c "php /var/www/html/occ db:convert-filecache-bigint"'
     network_mode: host
     detach: no
     auto_remove: yes
@@ -93,4 +106,3 @@
     state: started
     enabled: yes
     daemon_reload: yes
-
diff --git a/roles/elevate/media/templates/nextcloud-cron.service.j2 b/roles/elevate/media/templates/nextcloud-cron.service.j2
index 5c7e056d..c88d3bdc 100644
--- a/roles/elevate/media/templates/nextcloud-cron.service.j2
+++ b/roles/elevate/media/templates/nextcloud-cron.service.j2
@@ -3,7 +3,7 @@ Description=Nextcloud cron.php job
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/docker exec -u www-data nextcloud php -f /var/www/html/cron.php
+ExecStart=/usr/bin/docker exec -u www-data nextcloud.service php -f /var/www/html/cron.php
 NoNewPrivileges=yes
 PrivateTmp=yes
 PrivateDevices=yes
-- 
cgit v1.2.3