Skip to content

Commit 148f0ae

Browse files
committed
fix(freebsd): make kernel module name configurable
With FreeBSD 13 if_tap was merged into if_tuntap. https://reviews.freebsd.org/D20044
1 parent 1859248 commit 148f0ae

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

openvpn/general_config.sls

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ openvpn_config_dir:
4242
{%- if grains.os_family == 'FreeBSD' %}
4343
openvpn_kldload_if_tap:
4444
kmod.present:
45-
- name: if_tap
45+
- name: {{ map.kernel_module_name }}
4646
- persist: True
47+
- unless:
48+
# In case the kernel has the module compiled in, we skip this state.
49+
- sh -c "kldstat -v | grep --quiet --extended-regexp '^\s+[0-9]+ {{ map.kernel_module_name }}$'"
4750
- require_in:
4851
- sls: openvpn.config
4952
{%- endif %}

openvpn/parameters/os_family/FreeBSD.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ values:
1616
user: openvpn
1717
manage_user: false
1818
manage_group: false
19+
kernel_module_name: if_tap
1920
...

0 commit comments

Comments
 (0)