From 416b590f88aea107a269f6a014e2519218852c78 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Mon, 23 Dec 2019 23:43:43 +0100
Subject: nextcloud: upgrade all instances and add occ script

---
 roles/nextcloud/files/nextcloud-upgrade        | 42 --------------------------
 roles/nextcloud/tasks/main.yml                 | 11 ++++---
 roles/nextcloud/templates/nextcloud-occ.j2     | 20 ++++++++++++
 roles/nextcloud/templates/nextcloud-upgrade.j2 | 42 ++++++++++++++++++++++++++
 4 files changed, 69 insertions(+), 46 deletions(-)
 delete mode 100755 roles/nextcloud/files/nextcloud-upgrade
 create mode 100755 roles/nextcloud/templates/nextcloud-occ.j2
 create mode 100755 roles/nextcloud/templates/nextcloud-upgrade.j2

(limited to 'roles')

diff --git a/roles/nextcloud/files/nextcloud-upgrade b/roles/nextcloud/files/nextcloud-upgrade
deleted file mode 100755
index aac5001f..00000000
--- a/roles/nextcloud/files/nextcloud-upgrade
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-INST_NAME="$1"
-VERSION="$2"
-if [ -z "$INST_NAME" ] || [ -z "$VERSION" ]; then
-  echo "Usage: $0 <instance> <version>"
-  exit 1
-fi
-
-set -eu
-
-K8S_MANIFEST_D="/etc/kubernetes/manifests/"
-K8S_MANIFEST_FILE="$K8S_MANIFEST_D/nextcloud-$INST_NAME.yml"
-if [ ! -e "$K8S_MANIFEST_FILE" ]; then
-  echo "could not find manifest file: $K8S_MANIFEST_FILE"
-  exit 2
-fi
-
-TMP_D=$(mktemp -d -t nextcloud-upgrade.XXXXXXX)
-function cleanup {
-  rm -rf "$TMP_D"
-}
-trap cleanup EXIT
-
-echo "*** Pre-Pulling the image"
-echo ""
-ctr -n k8s.io image pull "docker.io/library/nextcloud:$VERSION"
-echo ""
-
-echo "*** Patching manifest file"
-echo ""
-sed "s#image: \"nextcloud:.*\"#image: \"nextcloud:$VERSION\"#" "$K8S_MANIFEST_FILE" > "$TMP_D/upgraded.yml"
-set +e
-diff -u "$K8S_MANIFEST_FILE" "$TMP_D/upgraded.yml"
-if [ $? -eq 0 ]; then
-  echo "patching file failed?"
-  exit 2
-fi
-cat "$TMP_D/upgraded.yml" > "$K8S_MANIFEST_FILE"
-echo ""
-
-exit 0
diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
index 8a816c2e..a53f4307 100644
--- a/roles/nextcloud/tasks/main.yml
+++ b/roles/nextcloud/tasks/main.yml
@@ -153,8 +153,11 @@
         replacement: "https://$host/"
 
 
-- name: install upgrade script
-  copy:
-    src: nextcloud-upgrade
-    dest: /usr/local/bin/nextcloud-upgrade
+- name: install management scripts
+  loop:
+    - nextcloud-upgrade
+    - nextcloud-occ
+  template:
+    src: "{{ item }}.j2"
+    dest: "/usr/local/bin/{{ item }}"
     mode: 0755
diff --git a/roles/nextcloud/templates/nextcloud-occ.j2 b/roles/nextcloud/templates/nextcloud-occ.j2
new file mode 100755
index 00000000..91977ccd
--- /dev/null
+++ b/roles/nextcloud/templates/nextcloud-occ.j2
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+INST_NAME="$1"
+shift
+
+if [ -z "$INST_NAME" ]; then
+  echo "Usage: $0 <instance> [ <arguments for occ.php> ... ]"
+  exit 1
+fi
+
+set -eu
+export CONTAINER_RUNTIME_ENDPOINT="unix:///run/containerd/containerd.sock"
+
+pod_id=$(crictl pods -q --state ready --name "$INST_NAME-{{ ansible_nodename }}")
+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 $@
diff --git a/roles/nextcloud/templates/nextcloud-upgrade.j2 b/roles/nextcloud/templates/nextcloud-upgrade.j2
new file mode 100755
index 00000000..aac5001f
--- /dev/null
+++ b/roles/nextcloud/templates/nextcloud-upgrade.j2
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+INST_NAME="$1"
+VERSION="$2"
+if [ -z "$INST_NAME" ] || [ -z "$VERSION" ]; then
+  echo "Usage: $0 <instance> <version>"
+  exit 1
+fi
+
+set -eu
+
+K8S_MANIFEST_D="/etc/kubernetes/manifests/"
+K8S_MANIFEST_FILE="$K8S_MANIFEST_D/nextcloud-$INST_NAME.yml"
+if [ ! -e "$K8S_MANIFEST_FILE" ]; then
+  echo "could not find manifest file: $K8S_MANIFEST_FILE"
+  exit 2
+fi
+
+TMP_D=$(mktemp -d -t nextcloud-upgrade.XXXXXXX)
+function cleanup {
+  rm -rf "$TMP_D"
+}
+trap cleanup EXIT
+
+echo "*** Pre-Pulling the image"
+echo ""
+ctr -n k8s.io image pull "docker.io/library/nextcloud:$VERSION"
+echo ""
+
+echo "*** Patching manifest file"
+echo ""
+sed "s#image: \"nextcloud:.*\"#image: \"nextcloud:$VERSION\"#" "$K8S_MANIFEST_FILE" > "$TMP_D/upgraded.yml"
+set +e
+diff -u "$K8S_MANIFEST_FILE" "$TMP_D/upgraded.yml"
+if [ $? -eq 0 ]; then
+  echo "patching file failed?"
+  exit 2
+fi
+cat "$TMP_D/upgraded.yml" > "$K8S_MANIFEST_FILE"
+echo ""
+
+exit 0
-- 
cgit v1.2.3