summaryrefslogtreecommitdiff
path: root/roles/chaos-at-home/fileserver/tasks
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2021-04-04 19:34:15 +0200
committerChristian Pointner <equinox@spreadspace.org>2021-04-04 19:34:15 +0200
commit440c0680719c15eac4930e0b5b93174014919b62 (patch)
treef3dffb56fc594167f19483915f875b1b4edea1a9 /roles/chaos-at-home/fileserver/tasks
parentfix glt encoder lvm config (diff)
use path_join filter to build zfs mountpoints
Diffstat (limited to 'roles/chaos-at-home/fileserver/tasks')
-rw-r--r--roles/chaos-at-home/fileserver/tasks/main.yml4
1 files changed, 2 insertions, 2 deletions
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) }}"