1 files changed, 101 insertions, 79 deletions
diff --git a/inventory/host_vars/sk-cloudio/nextcloud.yml b/inventory/host_vars/sk-cloudio/nextcloud.yml
index a0b52cb5..3c5e5ae0 100644
--- a/inventory/host_vars/sk-cloudio/nextcloud.yml
+++ b/inventory/host_vars/sk-cloudio/nextcloud.yml
@@ -1,94 +1,116 @@
 ---
-nextcloud_zfs:
+_nextcloud_zfs_base_:
   pool: storage
   name: nextcloud
-  properties:
-    compression: lz4
 
 nextcloud_instances:
-  luzesombra.skillz.biz:
-    # new: true
-    version: 29.0.3
-    port: 8100
-    hostnames:
-    - luzesombra.skillz.biz
-    zfs_properties:
-      quota: 200G
-    redis:
-      version: 7.2.1
-    database:
-      type: mariadb
-      version: 11.1.2
-      password: "{{ vault_nextcloud_database_passwords['luzesombra.skillz.biz'] }}"
-  insomnia.skillz.biz:
-    # new: true
-    version: 29.0.3
-    port: 8101
-    hostnames:
-      - insomnia.skillz.biz
-    zfs_properties:
-      quota: 400G
-    redis:
-      version: 7.2.1
-    database:
-      type: mariadb
-      version: 10.11.5
-      password: "{{ vault_nextcloud_database_passwords['insomnia.skillz.biz'] }}"
-  nc.skillz.biz:
-    # new: true
-    version: 29.0.3
-    port: 8102
-    hostnames:
-      - nc.skillz.biz
-    zfs_properties:
-      quota: 200G
-    redis:
-      version: 7.2.1
-    database:
-      type: mariadb
-      version: 10.11.5
-      password: "{{ vault_nextcloud_database_passwords['nc.skillz.biz'] }}"
-      extra_args:
-      - "--log_bin_trust_function_creators=true"
-    custom_image:
-      dockerfile: |
-        RUN set -x \
-            && apt-get update -q \
-            && apt-get install -y -q ffmpeg \
-            && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-  visuals.pixeldada.com:
-    # new: true
-    version: 29.0.3
-    port: 8103
-    hostnames:
-    - visuals.pixeldada.com
-    zfs_properties:
-      quota: 100G
-    redis:
-      version: 7.2.4
-    database:
-      type: mariadb
-      version: 11.3.2
-      password: "{{ vault_nextcloud_database_passwords['visuals.pixeldada.com'] }}"
-      extra_args:
-      - "--log_bin_trust_function_creators=true"
-    custom_image:
-      dockerfile: |
-        RUN set -x \
-            && apt-get update -q \
-            && apt-get install -y -q ffmpeg \
-            && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+#  luzesombra.skillz.biz:
+#    # new: true
+#    version: 29.0.4
+#    port: 8100
+#    hostnames:
+#    - luzesombra.skillz.biz
+#    storage:
+#      type: zfs
+#      parent: "{{ _nextcloud_zfs_base_ }}"
+#      name: luzesombra.skillz.biz
+#      properties:
+#        quota: 200G
+#    redis:
+#      version: 7.2.1
+#    database:
+#      type: mariadb
+#      version: 11.1.2
+#      password: "{{ vault_nextcloud_database_passwords['luzesombra.skillz.biz'] }}"
+#  insomnia.skillz.biz:
+#    # new: true
+#    version: 29.0.4
+#    port: 8101
+#    hostnames:
+#    - insomnia.skillz.biz
+#    storage:
+#      type: zfs
+#      parent: "{{ _nextcloud_zfs_base_ }}"
+#      name: insomnia.skillz.biz
+#      properties:
+#        quota: 400G
+#    redis:
+#      version: 7.2.1
+#    database:
+#      type: mariadb
+#      version: 10.11.5
+#      password: "{{ vault_nextcloud_database_passwords['insomnia.skillz.biz'] }}"
+#  nc.skillz.biz:
+#    # new: true
+#    version: 29.0.4
+#    port: 8102
+#    hostnames:
+#    - nc.skillz.biz
+#    storage:
+#      type: zfs
+#      parent: "{{ _nextcloud_zfs_base_ }}"
+#      name: nc.skillz.biz
+#      properties:
+#        quota: 200G
+#    redis:
+#      version: 7.2.1
+#    database:
+#      type: mariadb
+#      version: 10.11.5
+#      password: "{{ vault_nextcloud_database_passwords['nc.skillz.biz'] }}"
+#      extra_args:
+#      - "--log_bin_trust_function_creators=true"
+#    custom_image:
+#      dockerfile: |
+#        RUN set -x \
+#            && apt-get update -q \
+#            && apt-get install -y -q ffmpeg \
+#            && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+#  visuals.pixeldada.com:
+#    # new: true
+#    version: 29.0.4
+#    port: 8103
+#    hostnames:
+#    - visuals.pixeldada.com
+#    storage:
+#      type: zfs
+#      parent: "{{ _nextcloud_zfs_base_ }}"
+#      name: visuals.pixeldada.com
+#      properties:
+#        quota: 100G
+#    redis:
+#      version: 7.2.4
+#    database:
+#      type: mariadb
+#      version: 11.3.2
+#      password: "{{ vault_nextcloud_database_passwords['visuals.pixeldada.com'] }}"
+#      extra_args:
+#      - "--log_bin_trust_function_creators=true"
+#    custom_image:
+#      dockerfile: |
+#        RUN set -x \
+#            && apt-get update -q \
+#            && apt-get install -y -q ffmpeg \
+#            && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
   wolke.elev8.at:
     # new: true
     version: 29.0.3
     port: 8105
-    hostnames:
-    - wolke.elev8.at
-    zfs_properties:
-      quota: 10G
+    storage:
+      type: zfs
+      parent: "{{ _nextcloud_zfs_base_ }}"
+      name: wolke.elev8.at
+      properties:
+        quota: 10G
     redis:
       version: 7.2.1
     database:
       type: mariadb
       version: 10.11.5
       password: "{{ vault_nextcloud_database_passwords['wolke.elev8.at'] }}"
+    publish:
+      zone: "{{ apps_publish_zone__sk_cloudio }}"
+      hostnames:
+      - wolke.elev8.at
+      tls:
+        certificate_provider: acmetool