11 files changed, 160 insertions, 72 deletions
diff --git a/roles/apps/nextcloud/base/defaults/main.yml b/roles/apps/nextcloud/base/defaults/main.yml
new file mode 100644
index 00000000..1a8a6d52
--- /dev/null
+++ b/roles/apps/nextcloud/base/defaults/main.yml
@@ -0,0 +1,9 @@
+---
+nextcloud_app_uid: "950"
+nextcloud_app_gid: "950"
+
+nextcloud_db_uid: "951"
+nextcloud_db_gid: "951"
+
+nextcloud_redis_uid: "952"
+nextcloud_redis_gid: "952"
diff --git a/roles/apps/nextcloud/base/tasks/main.yml b/roles/apps/nextcloud/base/tasks/main.yml
new file mode 100644
index 00000000..4c85a35c
--- /dev/null
+++ b/roles/apps/nextcloud/base/tasks/main.yml
@@ -0,0 +1,51 @@
+---
+- name: add group for nextcloud app
+  group:
+    name: nc-app
+    gid: "{{ nextcloud_app_gid }}"
+
+- name: add user for nextcloud app
+  user:
+    name: nc-app
+    uid: "{{ nextcloud_app_uid }}"
+    group: nc-app
+    password: "!"
+
+- name: add group for nextcloud db
+  group:
+    name: nc-db
+    gid: "{{ nextcloud_db_gid }}"
+
+- name: add user for nextcloud db
+  user:
+    name: nc-db
+    uid: "{{ nextcloud_db_uid }}"
+    group: nc-db
+    password: "!"
+
+- name: add group for nextcloud redis
+  group:
+    name: nc-redis
+    gid: "{{ nextcloud_redis_gid }}"
+
+- name: add user for nextcloud redis
+  user:
+    name: nc-redis
+    uid: "{{ nextcloud_redis_uid }}"
+    group: nc-redis
+    password: "!"
+
+- name: install template systemd unit for cron trigger
+  template:
+    src: cron@.service.j2
+    dest: /etc/systemd/system/nextcloud-cron@.service
+
+- name: install management scripts
+  loop:
+  - nextcloud-upgrade
+  - nextcloud-occ
+  - nextcloud-cron
+  template:
+    src: "{{ item }}.j2"
+    dest: "/usr/local/bin/{{ item }}"
+    mode: 0755
diff --git a/roles/apps/nextcloud/templates/cron@.service.j2 b/roles/apps/nextcloud/base/templates/cron@.service.j2
index d8cde0a3..d8cde0a3 100644
--- a/roles/apps/nextcloud/templates/cron@.service.j2
+++ b/roles/apps/nextcloud/base/templates/cron@.service.j2
diff --git a/roles/apps/nextcloud/templates/nextcloud-cron.j2 b/roles/apps/nextcloud/base/templates/nextcloud-cron.j2
index 355ae2c3..cf1d9715 100755
--- a/roles/apps/nextcloud/templates/nextcloud-cron.j2
+++ b/roles/apps/nextcloud/base/templates/nextcloud-cron.j2
@@ -16,4 +16,4 @@ if [ -z "$pod_id" ]; then echo "Pod not found"; exit 1; fi
 container_id=$(crictl ps -q --name '^nextcloud$' -p "$pod_id")
 if [ -z "$container_id" ]; then echo "Container not found"; exit 1; fi
 
-exec crictl exec "$container_id" php -f /var/www/html/cron.php
+exec crictl exec "$container_id" bash -c 'php -f /var/www/html/occ status -e; if [ $? -eq 0 ]; then php -f /var/www/html/cron.php; else echo "not running cron script when in maintenance mode"; fi'
diff --git a/roles/apps/nextcloud/templates/nextcloud-occ.j2 b/roles/apps/nextcloud/base/templates/nextcloud-occ.j2
index f12f1259..01383c95 100755
--- a/roles/apps/nextcloud/templates/nextcloud-occ.j2
+++ b/roles/apps/nextcloud/base/templates/nextcloud-occ.j2
@@ -16,4 +16,4 @@ if [ -z "$pod_id" ]; then echo "Pod not found"; exit 1; fi
 container_id=$(crictl ps -q --name '^nextcloud$' -p "$pod_id")
 if [ -z "$container_id" ]; then echo "Container not found"; exit 1; fi
 
-exec crictl exec -it "$container_id" php /var/www/html/occ $@
+exec crictl exec -it "$container_id" php -f /var/www/html/occ $@
diff --git a/roles/apps/nextcloud/templates/nextcloud-upgrade.j2 b/roles/apps/nextcloud/base/templates/nextcloud-upgrade.j2
index ffa912e8..f6edcb44 100755
--- a/roles/apps/nextcloud/templates/nextcloud-upgrade.j2
+++ b/roles/apps/nextcloud/base/templates/nextcloud-upgrade.j2
@@ -9,6 +9,13 @@ fi
 
 set -eu
 
+CURRENT_VERSION=$(nextcloud-occ "$INST_NAME" status -n --no-warnings --output plain | tr -d '\r' | awk -F : '/versionstring/ { print($2) }' | tr -d ' ')
+if [ "$CURRENT_VERSION" = "$VERSION" ]; then
+  echo "The current running version of nextcloud is already $CURRENT_VERSION, nothing to do here."
+  exit 0
+fi
+echo "will upgrade nextcloud instance $INST_NAME from '$CURRENT_VERSION' to '$VERSION'"
+
 K8S_CONFIG_HASH_D="/etc/kubernetes/config-hashes/"
 K8S_CONFIG_HASH_FILE="$K8S_CONFIG_HASH_D/nextcloud-$INST_NAME.yml"
 K8S_MANIFEST_D="/etc/kubernetes/manifests/"
@@ -41,16 +48,8 @@ else
   echo ""
 fi
 
-STORAGE_TYPE=$(findmnt -no fstype -T "$IMAGE_BUILD_D")
-if [ $STORAGE_TYPE == "zfs" ]; then
-  echo "*** creating ZFS snapshot"
-  echo ""
-
-  IMAGE_NAME_ESCAPED=${IMAGE_NAME/\//\\/}
-  CURRENT_VERSION=$(cat "$K8S_MANIFEST_FILE" | awk '/image: "'"$IMAGE_NAME_ESCAPED"':.*"/ { print($2) }' | tr -d '"' | cut -d ':' -f 2)
-  ZFS_VOLUME=$(findmnt -no source -T "$IMAGE_BUILD_D")
-  zfs snapshot "$ZFS_VOLUME@upgrade_$CURRENT_VERSION-to-$VERSION""_$(date '+%Y-%m-%m_%H:%M:%S')"
-fi
+INSTANCE_BASE_D=$(dirname "$IMAGE_BUILD_D")
+"$INSTANCE_BASE_D/upgrade.sh" prepare "$CURRENT_VERSION" "$VERSION"
 
 echo "*** Rebuilding config-hash file"
 echo ""
@@ -70,4 +69,6 @@ cat "$TMP_D/config-hash.yml" > "$K8S_CONFIG_HASH_FILE"
 cat "$TMP_D/manifest.yml" > "$K8S_MANIFEST_FILE"
 echo ""
 
+"$INSTANCE_BASE_D/upgrade.sh" finalize "$CURRENT_VERSION" "$VERSION"
+
 exit 0
diff --git a/roles/apps/nextcloud/defaults/main.yml b/roles/apps/nextcloud/defaults/main.yml
index 158da180..631b0a0a 100644
--- a/roles/apps/nextcloud/defaults/main.yml
+++ b/roles/apps/nextcloud/defaults/main.yml
@@ -1,13 +1,4 @@
 ---
-nextcloud_app_uid: "950"
-nextcloud_app_gid: "950"
-
-nextcloud_db_uid: "951"
-nextcloud_db_gid: "951"
-
-nextcloud_redis_uid: "952"
-nextcloud_redis_gid: "952"
-
 # nextcloud_instances:
 #   example:
 #     new: yes
diff --git a/roles/apps/nextcloud/instance/tasks/main.yml b/roles/apps/nextcloud/instance/tasks/main.yml
index 3c8928b2..71a3ee79 100644
--- a/roles/apps/nextcloud/instance/tasks/main.yml
+++ b/roles/apps/nextcloud/instance/tasks/main.yml
@@ -108,6 +108,13 @@
     name: kubernetes/standalone/pod
 
 
+- name: install upgrade helper script
+  template:
+    src: upgrade.sh.j2
+    dest: "{{ nextcloud_instance_basepath }}/upgrade.sh"
+    mode: 0755
+
+
 - name: install systemd timer unit
   template:
     src: cron-.timer.j2
diff --git a/roles/apps/nextcloud/instance/templates/upgrade.sh.j2 b/roles/apps/nextcloud/instance/templates/upgrade.sh.j2
new file mode 100644
index 00000000..62f6641e
--- /dev/null
+++ b/roles/apps/nextcloud/instance/templates/upgrade.sh.j2
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+set -e
+
+if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
+  echo "Usage: $0 (preapre|finalize) <old-version> <new-version>"
+  exit 1
+fi
+
+COMMAND="$1"
+OLD_VERSION="$2"
+NEW_VERSION="$3"
+POD_NAME="{{ nextcloud_instance }}-$(hostname)"
+
+maintenance_mode() {
+  POD_ID=$(crictl pods --name "$POD_NAME" --state ready -q)
+  CONTAINER_ID=$(crictl ps --pod "$POD_ID" --name nextcloud -q)
+  crictl exec "$CONTAINER_ID" php -f /var/www/html/occ maintenance:mode "$1"
+}
+
+wait_for_cronjobs() {
+  POD_ID=$(crictl pods --name "$POD_NAME" --state ready -q)
+  CONTAINER_ID=$(crictl ps --pod "$POD_ID" --name nextcloud -q)
+  crictl exec "$CONTAINER_ID" bash -c 'echo -n "waiting for running cron script "; while [ -n "$(pgrep -a php | grep cron.php)" ]; do echo -n "."; sleep 1; done; echo ""'
+}
+
+wait_for_upgrade_complete() {
+  NEW_VERSION="$1"
+
+  set +e
+  echo -n "waiting for new version to be ready "
+  while true; do
+    POD_ID=$(crictl pods --name "$POD_NAME" --state ready -q)
+    if [ -z $POD_ID ]; then continue; fi
+    CONTAINER_ID=$(crictl ps --pod "$POD_ID" --name nextcloud -q)
+    if [ -z $CONTAINER_ID ]; then continue; fi
+    STATUS_OUTPUT=$(crictl exec "$CONTAINER_ID" php -f /var/www/html/occ status -n --no-warnings --output plain)
+    if [ $? -eq 0 ]; then
+      RUNNING_VERSION=$(echo "$STATUS_OUTPUT" | awk -F : '/versionstring/ { print($2) }' | tr -d ' ')
+      if [ "$RUNNING_VERSION" = "$NEW_VERSION" ]; then
+        break
+      fi
+      echo -n "."
+    fi
+    sleep 1
+  done
+  echo ""
+  set -e
+  crictl exec "$CONTAINER_ID" bash -c 'echo -n "waiting for apache to start "; while [ -z "$(pgrep apache2)" ]; do echo -n "."; sleep 1; done; echo ""'
+}
+
+storage_snapshot() {
+  OLD_VERSION="$1"
+  NEW_VERSION="$2"
+
+{% if nextcloud_instances[nextcloud_instance].storage.type == 'zfs' %}
+  ZFS_VOLUME=$(findmnt -no source -T "{{ nextcloud_instance_basepath }}")
+  echo "creating snapshot for zfs volume: $ZFS_VOLUME"
+  zfs snapshot "$ZFS_VOLUME@upgrade_$OLD_VERSION-to-$NEW_VERSION""_$(date '+%Y-%m-%m_%H:%M:%S')"
+{% endif %}
+}
+
+case "$COMMAND" in
+  prepare)
+    maintenance_mode --on
+    wait_for_cronjobs
+    storage_snapshot "$OLD_VERSION" "$NEW_VERSION"
+    ;;
+  finalize)
+    wait_for_upgrade_complete "$NEW_VERSION"
+    maintenance_mode --off
+    ;;
+  *)
+    echo "unknown command: $COMMAND, must be prepare or finalize"
+    exit 1
+    ;;
+esac
diff --git a/roles/apps/nextcloud/meta/main.yml b/roles/apps/nextcloud/meta/main.yml
new file mode 100644
index 00000000..c00c47ce
--- /dev/null
+++ b/roles/apps/nextcloud/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - role: apps/nextcloud/base
diff --git a/roles/apps/nextcloud/tasks/main.yml b/roles/apps/nextcloud/tasks/main.yml
index 69bbba6a..6e81f351 100644
--- a/roles/apps/nextcloud/tasks/main.yml
+++ b/roles/apps/nextcloud/tasks/main.yml
@@ -1,55 +1,4 @@
 ---
-- name: add group for nextcloud app
-  group:
-    name: nc-app
-    gid: "{{ nextcloud_app_gid }}"
-
-- name: add user for nextcloud app
-  user:
-    name: nc-app
-    uid: "{{ nextcloud_app_uid }}"
-    group: nc-app
-    password: "!"
-
-- name: add group for nextcloud db
-  group:
-    name: nc-db
-    gid: "{{ nextcloud_db_gid }}"
-
-- name: add user for nextcloud db
-  user:
-    name: nc-db
-    uid: "{{ nextcloud_db_uid }}"
-    group: nc-db
-    password: "!"
-
-- name: add group for nextcloud redis
-  group:
-    name: nc-redis
-    gid: "{{ nextcloud_redis_gid }}"
-
-- name: add user for nextcloud redis
-  user:
-    name: nc-redis
-    uid: "{{ nextcloud_redis_uid }}"
-    group: nc-redis
-    password: "!"
-
-- name: install template systemd unit for cron trigger
-  template:
-    src: cron@.service.j2
-    dest: /etc/systemd/system/nextcloud-cron@.service
-
-- name: install management scripts
-  loop:
-  - nextcloud-upgrade
-  - nextcloud-occ
-  - nextcloud-cron
-  template:
-    src: "{{ item }}.j2"
-    dest: "/usr/local/bin/{{ item }}"
-    mode: 0755
-
 - name: instance specific tasks
   loop: "{{ nextcloud_instances | list }}"
   loop_control: