From 5205bb83082e992e07d92d139a7c34caaca95b4d Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Sat, 18 Feb 2023 21:40:10 +0100 Subject: [PATCH] fix autoperms use of the vpn configfile --- library/common/templates/lib/util/_autoperms.tpl | 2 +- library/common/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/common/templates/lib/util/_autoperms.tpl b/library/common/templates/lib/util/_autoperms.tpl index 07e85d8e..0af282f0 100644 --- a/library/common/templates/lib/util/_autoperms.tpl +++ b/library/common/templates/lib/util/_autoperms.tpl @@ -93,7 +93,7 @@ spec: {{- $_ := set $hostPathMounts $name $mount -}} {{- end -}} {{- end }} - {{- if and ( .Values.addons.vpn.configFile.enabled ) ( ne .Values.addons.vpn.type "disabled" ) ( ne .Values.addons.vpn.type "tailscale" ) }} + {{- if and ( .Values.addons.vpn.configFile ) ( ne .Values.addons.vpn.type "disabled" ) ( ne .Values.addons.vpn.type "tailscale" ) }} echo "Automatically correcting permissions for vpn config file..." {{- if $.Values.ixChartContext }} /usr/sbin/nfs4xdr_winacl -a chown -O 568 -G 568 -c /vpn/vpn.conf -p /vpn/vpn.conf || echo "Failed setting permissions using winacl..." diff --git a/library/common/values.yaml b/library/common/values.yaml index 1173658e..937fa2e7 100644 --- a/library/common/values.yaml +++ b/library/common/values.yaml @@ -505,9 +505,9 @@ addons: # value: somevalue # -- Provide a customized vpn configuration file to be used by the VPN. - configFile: "/vpn/vpn.conf" + configFile: "" - # -- Provide a customized vpn configuration file to be used by the VPN. + # -- Provide a customized vpn configuration folder to be added to the VPN container configFolder: "" ## TODO to be implemented