diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-04-04 19:34:15 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-04-04 19:34:15 +0200 |
| commit | 440c0680719c15eac4930e0b5b93174014919b62 (patch) | |
| tree | f3dffb56fc594167f19483915f875b1b4edea1a9 /roles | |
| parent | fix glt encoder lvm config (diff) | |
use path_join filter to build zfs mountpoints
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/apps/etherpad-lite/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/apps/keycloak/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/apps/nextcloud/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/chaos-at-home/fileserver/tasks/main.yml | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/roles/apps/etherpad-lite/tasks/main.yml b/roles/apps/etherpad-lite/tasks/main.yml index caf53efd..ef6a54d4 100644 --- a/roles/apps/etherpad-lite/tasks/main.yml +++ b/roles/apps/etherpad-lite/tasks/main.yml @@ -19,7 +19,7 @@ - name: configure etherpad_lite base bath set_fact: - etherpad_lite_base_path: "{{ zfs_pools[etherpad_lite_zfs.pool].mountpoint }}/{{ etherpad_lite_zfs.name }}" + etherpad_lite_base_path: "{{ (zfs_pools[etherpad_lite_zfs.pool].mountpoint, etherpad_lite_zfs.name) | path_join }}" - name: create instance subdirectories diff --git a/roles/apps/keycloak/tasks/main.yml b/roles/apps/keycloak/tasks/main.yml index 917aa68e..b5a756d0 100644 --- a/roles/apps/keycloak/tasks/main.yml +++ b/roles/apps/keycloak/tasks/main.yml @@ -19,7 +19,7 @@ - name: configure keycloak base bath set_fact: - keycloak_base_path: "{{ zfs_pools[keycloak_zfs.pool].mountpoint }}/{{ keycloak_zfs.name }}" + keycloak_base_path: "{{ (zfs_pools[keycloak_zfs.pool].mountpoint, keycloak_zfs.name) | path_join }}" - name: create instance subdirectories diff --git a/roles/apps/nextcloud/tasks/main.yml b/roles/apps/nextcloud/tasks/main.yml index 14aa7085..474d0d88 100644 --- a/roles/apps/nextcloud/tasks/main.yml +++ b/roles/apps/nextcloud/tasks/main.yml @@ -19,7 +19,7 @@ - name: configure nextcloud base bath set_fact: - nextcloud_base_path: "{{ zfs_pools[nextcloud_zfs.pool].mountpoint }}/{{ nextcloud_zfs.name }}" + nextcloud_base_path: "{{ (zfs_pools[nextcloud_zfs.pool].mountpoint, nextcloud_zfs.name) | path_join }}" - name: create instance subdirectories diff --git a/roles/chaos-at-home/fileserver/tasks/main.yml b/roles/chaos-at-home/fileserver/tasks/main.yml index 3466d390..936abd89 100644 --- a/roles/chaos-at-home/fileserver/tasks/main.yml +++ b/roles/chaos-at-home/fileserver/tasks/main.yml @@ -42,7 +42,7 @@ label: "{{ item.export_as | default(item.name) }}" when: (item.export is not defined) or (item.export | bool) mount: - src: "{{ zfs_pools[(item.pool | default(fileserver_zfs_default_pool))].mountpoint }}/{{ item.name }}" + src: "{{ ((zfs_pools[(item.pool | default(fileserver_zfs_default_pool))].mountpoint), item.name) | path_join }}" path: "{{ fileserver_nfs_root }}/{{ item.export_as | default(item.name) }}" fstype: none opts: defaults,bind,x-systemd.automount,nofail @@ -99,7 +99,7 @@ label: "{{ item.pool | default(fileserver_zfs_default_pool) }}/{{ item.name }}" when: item.owner is defined or item.group is defined or item.mode is defined file: - path: "{{ zfs_pools[(item.pool | default(fileserver_zfs_default_pool))].mountpoint }}/{{ item.name }}" + path: "{{ ((zfs_pools[(item.pool | default(fileserver_zfs_default_pool))].mountpoint), item.name) | path_join }}" owner: "{{ item.owner | default(omit) }}" group: "{{ item.group | default(omit) }}" mode: "{{ item.mode | default(omit) }}" |