diff options
| -rw-r--r-- | inventory/host_vars/sk-cloudia/nextcloud.yml | 8 | ||||
| -rw-r--r-- | roles/nextcloud/tasks/main.yml | 11 | ||||
| -rwxr-xr-x | roles/nextcloud/templates/nextcloud-occ.j2 | 20 | ||||
| -rwxr-xr-x | roles/nextcloud/templates/nextcloud-upgrade.j2 (renamed from roles/nextcloud/files/nextcloud-upgrade) | 0 |
4 files changed, 31 insertions, 8 deletions
diff --git a/inventory/host_vars/sk-cloudia/nextcloud.yml b/inventory/host_vars/sk-cloudia/nextcloud.yml index 34acfed7..4cb270c5 100644 --- a/inventory/host_vars/sk-cloudia/nextcloud.yml +++ b/inventory/host_vars/sk-cloudia/nextcloud.yml @@ -7,7 +7,7 @@ nextcloud_zfs: nextcloud_instances: wolke.elevate.at: # new: true - version: 17.0.1 + version: 17.0.2 port: 8100 hostnames: - wolke.elevate.at @@ -18,7 +18,7 @@ nextcloud_instances: password: "{{ vault_nextcloud_database_passwords['wolke.elevate.at'] }}" insomnia.skillz.biz: # new: true - version: 17.0.1 + version: 17.0.2 port: 8101 hostnames: - insomnia.skillz.biz @@ -29,7 +29,7 @@ nextcloud_instances: password: "{{ vault_nextcloud_database_passwords['insomnia.skillz.biz'] }}" nc.skillz.biz: # new: true - version: 17.0.1 + version: 17.0.2 port: 8102 hostnames: - nc.skillz.biz @@ -40,7 +40,7 @@ nextcloud_instances: password: "{{ vault_nextcloud_database_passwords['nc.skillz.biz'] }}" wae.elevate.at: # new: true - version: 17.0.1 + version: 17.0.2 port: 8104 hostnames: - wae.elevate.at 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/files/nextcloud-upgrade b/roles/nextcloud/templates/nextcloud-upgrade.j2 index aac5001f..aac5001f 100755 --- a/roles/nextcloud/files/nextcloud-upgrade +++ b/roles/nextcloud/templates/nextcloud-upgrade.j2 |