From 7db98bc9d14af89661e16431c159d81177766ad0 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 28 Oct 2022 21:51:08 -0400 Subject: [PATCH] Add support for jail.conf.d files. --- ansible/environments/laptop/host_vars/odofreebsd | 2 ++ ansible/roles/jail/files/jails/cloak.conf | 0 ansible/roles/jail/tasks/freebsd.yaml | 11 +++++++++++ 3 files changed, 13 insertions(+) create mode 100644 ansible/roles/jail/files/jails/cloak.conf diff --git a/ansible/environments/laptop/host_vars/odofreebsd b/ansible/environments/laptop/host_vars/odofreebsd index fd2fc3a..0832903 100644 --- a/ansible/environments/laptop/host_vars/odofreebsd +++ b/ansible/environments/laptop/host_vars/odofreebsd @@ -40,3 +40,5 @@ jail_zfs_dataset: zroot/freebsd/release/jails jail_zfs_dataset_mountpoint: /jail/main jail_list: - name: cloak + conf: + src: cloak diff --git a/ansible/roles/jail/files/jails/cloak.conf b/ansible/roles/jail/files/jails/cloak.conf new file mode 100644 index 0000000..e69de29 diff --git a/ansible/roles/jail/tasks/freebsd.yaml b/ansible/roles/jail/tasks/freebsd.yaml index 97db82d..db99c14 100644 --- a/ansible/roles/jail/tasks/freebsd.yaml +++ b/ansible/roles/jail/tasks/freebsd.yaml @@ -60,6 +60,16 @@ group: wheel loop: "{{ jail_list|subelements('files', skip_missing=True) }}" +- name: Install jail.conf files + when: item.conf.src is defined + copy: + src: "files/jails/{{ item.conf.src }}.conf" + dest: "/etc/jail.conf.d/{{ item.conf.dest|default(item.conf.src) }}.conf" + mode: "0644" + owner: root + group: wheel + loop: "{{ jail_list }}" + - name: Enable Jails community.general.sysrc: name: jail_enable @@ -79,3 +89,4 @@ path: /etc/rc.conf.d/jail state: absent when: jail_list|community.general.json_query('[?enabled==`true`]')|length == 0 +