From a6f89b7835738c68cb597e76008b43839a5221be Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 25 Nov 2022 21:57:15 +0100 Subject: extend pix.elevate.at image paths --- inventory/host_vars/sk-cloudio/pigallery2.yml | 6 +++++- roles/apps/pigallery2/defaults/main.yml | 4 +++- roles/apps/pigallery2/templates/pod-spec.yml.j2 | 12 ++++++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/inventory/host_vars/sk-cloudio/pigallery2.yml b/inventory/host_vars/sk-cloudio/pigallery2.yml index fdbf8cc8..0a793afd 100644 --- a/inventory/host_vars/sk-cloudio/pigallery2.yml +++ b/inventory/host_vars/sk-cloudio/pigallery2.yml @@ -12,4 +12,8 @@ pigallery2_instances: hostname: pix.elevate.at zfs_properties: quota: 1G - images_path: /srv/storage/nextcloud/wolke.elevate.at/nextcloud/data/__groupfolders/1/Editions_2014_2022/Fotos_Editions/2022/ + images_paths: + 2020: /srv/storage/nextcloud/wolke.elevate.at/nextcloud/data/__groupfolders/1/Editions_2014_2022/Fotos_Editions/2020/ + 2021: /srv/storage/nextcloud/wolke.elevate.at/nextcloud/data/__groupfolders/1/Editions_2014_2022/Fotos_Editions/2021/ + 2022: /srv/storage/nextcloud/wolke.elevate.at/nextcloud/data/__groupfolders/1/Editions_2014_2022/Fotos_Editions/2022/ + 2023: /srv/storage/nextcloud/wolke.elevate.at/nextcloud/data/__groupfolders/1/Editions_2014_2022/Fotos_Editions/2023/ diff --git a/roles/apps/pigallery2/defaults/main.yml b/roles/apps/pigallery2/defaults/main.yml index 3affc3fb..db34ae9a 100644 --- a/roles/apps/pigallery2/defaults/main.yml +++ b/roles/apps/pigallery2/defaults/main.yml @@ -17,4 +17,6 @@ pigallery2_app_gid: "970" # hostname: gallery.example.com # zfs_properties: # quota: 1G -# images_path: /path/to/images +# images_paths: +# example: /path/to/images +# foo: /path/to/foo diff --git a/roles/apps/pigallery2/templates/pod-spec.yml.j2 b/roles/apps/pigallery2/templates/pod-spec.yml.j2 index e0921b3b..c47beb6f 100644 --- a/roles/apps/pigallery2/templates/pod-spec.yml.j2 +++ b/roles/apps/pigallery2/templates/pod-spec.yml.j2 @@ -16,9 +16,11 @@ containers: mountPath: /app/data/db - name: tmp mountPath: /app/data/tmp - - name: images - mountPath: /app/data/images +{% for mountpoint, images_path in item.value.images_paths.items() %} + - name: images-{{ mountpoint }} + mountPath: /app/data/images/{{ mountpoint }} readOnly: true +{% endfor %} env: - name: PORT value: "{{ item.value.port }}" @@ -41,7 +43,9 @@ volumes: hostPath: path: "{{ pigallery2_base_path }}/{{ item.key }}/tmp/" type: Directory -- name: images +{% for mountpoint, images_path in item.value.images_paths.items() %} +- name: images-{{ mountpoint }} hostPath: - path: "{{ item.value.images_path }}" + path: "{{ images_path }}" type: Directory +{% endfor %} -- cgit v1.2.3