From 93d118dcc07a2e1c9b48d4b56a1b30d096b5cee2 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 13 Jan 2019 02:16:31 +0100
Subject: nextcloud is now running as share:share

---
 roles/elevate/media/tasks/nextcloud.yml | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

(limited to 'roles/elevate/media/tasks/nextcloud.yml')

diff --git a/roles/elevate/media/tasks/nextcloud.yml b/roles/elevate/media/tasks/nextcloud.yml
index 8531699c..ca9a2572 100644
--- a/roles/elevate/media/tasks/nextcloud.yml
+++ b/roles/elevate/media/tasks/nextcloud.yml
@@ -13,6 +13,25 @@
     dest: /srv/nextcloud/config/nextcloud-fpm.conf
 
 
+- name: create docker build-context for patched nextcloud image
+  file:
+    path: /srv/nextcloud/docker/
+    state: directory
+
+- name: install Dockerfile for patched nextcloud image
+  template:
+    src: nextcloud-Dockerfile.j2
+    dest: /srv/nextcloud/docker/Dockerfile
+  register: nextcloud_dockerfile
+
+- name: build patched nextcloud image
+  docker_image:
+    state: present
+    name: nextcloud
+    tag: "{{ inventory_hostname }}"
+    path: /srv/nextcloud/docker/
+    force: "{{ nextcloud_dockerfile.changed }}"
+
 - name: create nextcloud database
   mysql_db:
     login_user: root
@@ -36,7 +55,7 @@
 #
 # systemctl disable nextcloud-cron.timer
 # systemctl stop nextcloud-cron.timer
-# systemctl disable nextcloud.serivce
+# systemctl disable nextcloud.service
 # systemctl stop nextcloud.service
 # rm -rf /srv/nextcloud/config/nextcloud
 # rm -rf /srv/ncdata/nextcloud
@@ -51,8 +70,8 @@
 - name: running nextcloud installer
   when: not nextcloud_config_file.stat.exists
   docker_container:
-    name: nextcloud
-    image: nextcloud:{{ nextcloud_version }}-fpm
+    name: nextcloud-installer
+    image: "nextcloud:{{ inventory_hostname }}"
     ## 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"'
@@ -64,7 +83,7 @@
       - /srv/nextcloud/config/nextcloud-fpm.conf:/usr/local/etc/php-fpm.d/zzzzz.conf
       - /srv/nextcloud/config/nextcloud:/var/www/html/config
       - /srv/ncdata/nextcloud:/var/www/html/data
-      - /srv/ncdata/share:/srv/external
+      - /srv/smbdata/share:/srv/external/share
     env:
       NEXTCLOUD_UPDATE: '1'
       NEXTCLOUD_TRUSTED_DOMAINS: "{{ nextcloud_hostnames | join(' ') }}"
-- 
cgit v1.2.3