summaryrefslogtreecommitdiff
path: root/roles/apps/nextcloud/tasks
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2020-06-14 21:33:41 +0200
committerChristian Pointner <equinox@spreadspace.org>2020-06-14 21:33:41 +0200
commit3e462c69e5cc515e519dc2622ef151bb8d1ad386 (patch)
tree0aa926fdf24f2b783d2ae311bfbed6b465cf9277 /roles/apps/nextcloud/tasks
parentdocker/containerd/kubelet: more flexible handling of zfs properties (diff)
nextcloud/etherpad-lite imrpoved zfs property handling
Diffstat (limited to 'roles/apps/nextcloud/tasks')
-rw-r--r--roles/apps/nextcloud/tasks/main.yml8
1 files changed, 3 insertions, 5 deletions
diff --git a/roles/apps/nextcloud/tasks/main.yml b/roles/apps/nextcloud/tasks/main.yml
index 1a17bb55..b08ce2d0 100644
--- a/roles/apps/nextcloud/tasks/main.yml
+++ b/roles/apps/nextcloud/tasks/main.yml
@@ -6,18 +6,16 @@
zfs:
name: "{{ nextcloud_zfs.pool }}/{{ nextcloud_zfs.name }}"
state: present
- extra_zfs_properties:
- quota: "{{ nextcloud_zfs.size }}"
+ extra_zfs_properties: "{{ nextcloud_zfs.properties | default(omit) }}"
- name: create zfs volumes for instances
loop: "{{ nextcloud_instances | dict2items }}"
loop_control:
- label: "{{ item.key }} ({{ item.value.quota | default('-') }})"
+ label: "{{ item.key }} ({{ (item.value.zfs_properties | default({})).items() | map('join', '=') | join(', ') }})"
zfs:
name: "{{ nextcloud_zfs.pool }}/{{ nextcloud_zfs.name }}/{{ item.key }}"
state: present
- extra_zfs_properties:
- quota: "{{ item.value.quota }}"
+ extra_zfs_properties: "{{ item.value.zfs_properties | default(omit) }}"
- name: configure nextcloud base bath
set_fact: