nextcloud/etherpad-lite imrpoved zfs property handling

7 files changed, 32 insertions, 23 deletions

diff --git a/inventory/host_vars/sk-cloudia/etherpad.yml b/inventory/host_vars/sk-cloudia/etherpad.yml
index 9b6126e1..1d82e4b3 100644
--- a/inventory/host_vars/sk-cloudia/etherpad.yml
+++ b/inventory/host_vars/sk-cloudia/etherpad.yml
@@ -2,7 +2,8 @@
 etherpad_lite_zfs:
   pool: storage
   name: etherpad-lite
-  size: 20G
+  properties:
+    compression: lz4
 
 etherpad_lite_instances:
   pad.elevate.at:
@@ -10,7 +11,8 @@ etherpad_lite_instances:
     port: 8300
     hostnames:
       - pad.elevate.at
-    quota: 5G
+    zfs_properties:
+      quota: 5G
     settings:
       title: Elevate Etherpad
       users:
diff --git a/inventory/host_vars/sk-cloudia/nextcloud.yml b/inventory/host_vars/sk-cloudia/nextcloud.yml
index 1131e402..2b564a6e 100644
--- a/inventory/host_vars/sk-cloudia/nextcloud.yml
+++ b/inventory/host_vars/sk-cloudia/nextcloud.yml
@@ -2,7 +2,8 @@
 nextcloud_zfs:
   pool: storage
   name: nextcloud
-  size: 800G
+  properties:
+    compression: lz4
 
 nextcloud_instances:
   wolke.elevate.at:
@@ -11,7 +12,8 @@ nextcloud_instances:
     port: 8100
     hostnames:
     - wolke.elevate.at
-    quota: 300G
+    zfs_properties:
+      quota: 300G
     database:
       type: mariadb
       version: 10.4.13
@@ -22,7 +24,8 @@ nextcloud_instances:
     port: 8101
     hostnames:
       - insomnia.skillz.biz
-    quota: 200G
+    zfs_properties:
+      quota: 200G
     database:
       type: mariadb
       version: 10.4.13
@@ -33,7 +36,8 @@ nextcloud_instances:
     port: 8102
     hostnames:
       - nc.skillz.biz
-    quota: 200G
+    zfs_properties:
+      quota: 200G
     database:
       type: mariadb
       version: 10.4.13
@@ -44,7 +48,8 @@ nextcloud_instances:
     port: 8104
     hostnames:
     - wae.elevate.at
-    quota: 100G
+    zfs_properties:
+      quota: 100G
     database:
       type: mariadb
       version: 10.4.13
diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml
index 766bdcff..9df47214 100644
--- a/inventory/host_vars/sk-tomnext-nc.yml
+++ b/inventory/host_vars/sk-tomnext-nc.yml
@@ -93,7 +93,8 @@ postfix_simple_inet_interfaces:
 nextcloud_zfs:
   pool: storage
   name: nextcloud
-  size: 700G
+  properties:
+    compression: lz4
 
 nextcloud_instances:
   team.tomwaitz.eu:
@@ -102,7 +103,8 @@ nextcloud_instances:
     port: 8100
     hostnames:
       - team.tomwaitz.eu
-    quota: 700G
+    zfs_properties:
+      quota: 700G
     database:
       type: mariadb
       version: 10.5.3
diff --git a/roles/apps/etherpad-lite/defaults/main.yml b/roles/apps/etherpad-lite/defaults/main.yml
index 5281c739..0fa2df2d 100644
--- a/roles/apps/etherpad-lite/defaults/main.yml
+++ b/roles/apps/etherpad-lite/defaults/main.yml
@@ -10,7 +10,8 @@ etherpad_lite_db_gid: "941"
 # etherpad_lite_zfs:
 #   pool: storage
 #   name: etherpad_lite
-#   size: 20G
+#   properties:
+#     compression: lz4
 
 # etherpad_lite_instances:
 #   example:
@@ -18,7 +19,8 @@ etherpad_lite_db_gid: "941"
 #     port: 8300
 #     hostnames:
 #       - pad.example.com
-#     quota: 40G
+#     zfs_properties:
+#       quota: 5G
 #     settings:
 #        ....
 #     credentials:
diff --git a/roles/apps/etherpad-lite/tasks/main.yml b/roles/apps/etherpad-lite/tasks/main.yml
index 6d4551db..0beeb1e1 100644
--- a/roles/apps/etherpad-lite/tasks/main.yml
+++ b/roles/apps/etherpad-lite/tasks/main.yml
@@ -6,18 +6,16 @@
     zfs:
       name: "{{ etherpad_lite_zfs.pool }}/{{ etherpad_lite_zfs.name }}"
       state: present
-      extra_zfs_properties:
-        quota: "{{ etherpad_lite_zfs.size }}"
+      extra_zfs_properties: "{{ etherpad_lite_zfs.properties | default(omit) }}"
 
   - name: create zfs volumes for instances
     loop: "{{ etherpad_lite_instances | dict2items }}"
     loop_control:
-      label: "{{ item.key }} ({{ item.value.quota }})"
+      label: "{{ item.key }} ({{ (item.value.zfs_properties | default({})).items() | map('join', '=') | join(', ') }})"
     zfs:
       name: "{{ etherpad_lite_zfs.pool }}/{{ etherpad_lite_zfs.name }}/{{ item.key }}"
       state: present
-      extra_zfs_properties:
-        quota: "{{ item.value.quota }}"
+      extra_zfs_properties: "{{ item.value.zfs_properties | default(omit) }}"
 
   - name: configure etherpad_lite base bath
     set_fact:
diff --git a/roles/apps/nextcloud/defaults/main.yml b/roles/apps/nextcloud/defaults/main.yml
index 261f4fa6..f028713f 100644
--- a/roles/apps/nextcloud/defaults/main.yml
+++ b/roles/apps/nextcloud/defaults/main.yml
@@ -10,7 +10,8 @@ nextcloud_db_gid: "951"
 # nextcloud_zfs:
 #   pool: storage
 #   name: nextcloud
-#   size: 500G
+#   properties:
+#     compression: lz4
 
 # nextcloud_instances:
 #   example:
@@ -20,7 +21,8 @@ nextcloud_db_gid: "951"
 #     hostnames:
 #       - wolke.example.com
 #       - cloud.example.com
-#    quota: 100G
+#     zfs_properties:
+#       quota: 100G
 #    database:
 #      type: mariadb
 #      version: 10.4.8
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: