truecharts/library-charts
1
0
Fork 0
mirror of https://github.com/truecharts/library-charts.git synced 2026-07-03 09:29:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

more vpn fixes

Browse Source
This commit is contained in:
Kjeld Schouten-Lebbing
2023-04-16 13:28:15 +02:00
parent 298910c127
commit c6eb251e23
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/common/templates/addons/vpn/_gluetunContainer.tpl
View File

@@ -31,16 +31,16 @@ securityContext:
env:
DNS_KEEP_NAMESERVER: on
DOT: off
{{- if .Values.addons.vpn.killSwitch }}
{{- if $.Values.addons.vpn.killSwitch }}
FIREWALL: "on"
{{- $excludednetworksv4 := "172.16.0.0/12" -}}
{{- range .Values.addons.vpn.excludedNetworks_IPv4 -}}
{{- range $.Values.addons.vpn.excludedNetworks_IPv4 -}}
{{- $excludednetworksv4 = ( printf "%v,%v" $excludednetworksv4 . ) -}}
{{- end }}
{{- if .Values.addons.vpn.excludedNetworks_IPv6 -}}
{{- if $.Values.addons.vpn.excludedNetworks_IPv6 -}}
{{- $excludednetworksv6 := "" -}}
{{- range .Values.addons.vpn.excludedNetworks_IPv4 -}}
{{- range $.Values.addons.vpn.excludedNetworks_IPv4 -}}
{{- $excludednetworksv6 = ( printf "%v,%v" $excludednetworksv6 . ) -}}
{{- end }}
FIREWALL_OUTBOUND_SUBNETS: {{ ( printf "%v,%v" $excludednetworksv4 $excludednetworksv6 ) | quote }}

14
library/common/templates/addons/vpn/_openvpnContainer.tpl
View File

@@ -30,21 +30,21 @@ env:
{{- with $.Values.addons.vpn.env }}
{{- . | toYaml | nindent 2 }}
{{- end }}
{{- if and .Values.addons.vpn.openvpn.username .Values.addons.vpn.openvpn.password }}
VPN_AUTH: {{ (printf "%v;%v" .Values.addons.vpn.openvpn.username .Values.addons.vpn.openvpn.password) }}
{{- if and $.Values.addons.vpn.openvpn.username $.Values.addons.vpn.openvpn.password }}
VPN_AUTH: {{ (printf "%v;%v" $.Values.addons.vpn.openvpn.username $.Values.addons.vpn.openvpn.password) }}
{{- end -}}
{{- if .Values.addons.vpn.killSwitch }}
{{- if $.Values.addons.vpn.killSwitch }}
FIREWALL: "ON"
ROUTE_1: "172.16.0.0/12"
{{- range $index, $value := .Values.addons.vpn.excludedNetworks_IPv4 }}
{{- range $index, $value := $.Values.addons.vpn.excludedNetworks_IPv4 }}
ROUTE_{{ add $index 2 }}: {{ $value | quote }}
{{- end -}}
{{- if .Values.addons.vpn.excludedNetworks_IPv6 }}
{{- if $.Values.addons.vpn.excludedNetworks_IPv6 }}
{{- $excludednetworksv6 := "" -}}
{{- range .Values.addons.vpn.excludedNetworks_IPv4 -}}
{{- range $.Values.addons.vpn.excludedNetworks_IPv4 -}}
{{- $excludednetworksv6 = ( printf "%v;%v" $excludednetworksv6 . ) -}}
{{- end -}}
{{- range $index, $value := .Values.addons.vpn.excludedNetworks_IPv6 }}
{{- range $index, $value := $.Values.addons.vpn.excludedNetworks_IPv6 }}
ROUTE6_{{ add $index 1 }}: {{ $value | quote }}
{{- end -}}
{{- end -}}

10
library/common/templates/addons/vpn/_wireguardContainer.tpl
View File

@@ -35,19 +35,19 @@ env:
{{- end }}
SEPARATOR: ";"
IPTABLES_BACKEND: "nft"
{{- if .Values.addons.vpn.killSwitch }}
{{- if $.Values.addons.vpn.killSwitch }}
KILLSWITCH: "true"
{{- $excludednetworksv4 := "172.16.0.0/12" -}}
{{- range .Values.addons.vpn.excludedNetworks_IPv4 -}}
{{- range $.Values.addons.vpn.excludedNetworks_IPv4 -}}
{{- $excludednetworksv4 = ( printf "%v;%v" $excludednetworksv4 . ) -}}
{{- end }}
KILLSWITCH_EXCLUDEDNETWORKS_IPV4: {{ $excludednetworksv4 | quote }}
{{- if .Values.addons.vpn.excludedNetworks_IPv6 -}}
{{- if $.Values.addons.vpn.excludedNetworks_IPv6 -}}
{{- $excludednetworksv6 := "" -}}
{{- range .Values.addons.vpn.excludedNetworks_IPv4 -}}
{{- range $.Values.addons.vpn.excludedNetworks_IPv4 -}}
{{- $excludednetworksv6 = ( printf "%v;%v" $excludednetworksv6 . ) -}}
{{- end }}
KILLSWITCH_EXCLUDEDNETWORKS_IPV6: {{ .Values.addons.vpn.excludedNetworks_IPv6 | quote }}
KILLSWITCH_EXCLUDEDNETWORKS_IPV6: {{ $.Values.addons.vpn.excludedNetworks_IPv6 | quote }}
{{- end -}}
{{- end -}}