github/charts
4
0
Fork 0
mirror of https://github.com/truenas/charts.git synced 2024-04-21 15:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify validation

Browse Source
This commit is contained in:
Stavros kois
2023-05-22 14:48:36 +03:00
parent f48db6308c
commit 0f0f4887c1
27 changed files with 193 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
library/ix-dev/community/gluetun/charts/common-1.0.7.tgz
BIN
View File
Binary file not shown.
library/ix-dev/community/gluetun/templates/_configuration.tpl
+1 -1
View File
@@ -20,7 +20,7 @@ configmap:
{{- include "gluetun.configs.wireguard.env" $ | nindent 6 }}
{{- end }}
{{/* Include provider specific configuration */}}
{{/* Include provider specific validation */}}
{{- include (printf "gluetun.%v.%v.validation" .Values.gluetunConfig.provider .Values.gluetunConfig.type) $ | nindent 6 }}
{{- end -}}
library/ix-dev/community/gluetun/templates/_validation.tpl
+1 -1
View File
@@ -63,5 +63,5 @@
{{- end -}}
{{- define "gluetun.certkey.required.error" -}}
{{- fail (printf "Gluetun - Provider [%v] requires [Key and Certificate] either from [File or Content] method on type [openvpn]." .Values.gluetunConfig.provider) -}}
{{- fail (printf "Gluetun - Provider [%v] requires [Key and/or Certificate] either from [File or Content] method on type [openvpn]." .Values.gluetunConfig.provider) -}}
{{- end -}}
library/ix-dev/community/gluetun/templates/providers/_airvpn.tpl
+8 -15
View File
@@ -1,26 +1,19 @@
{{/* https://github.com/qdm12/gluetun/wiki/AirVPN */}}
{{- define "gluetun.airvpn.openvpn.validation" -}}
{{/* Cert and Key Required */}}
{{- $req := list -}}
{{- if eq .Values.gluetunConfig.openvpnCertKeyMethod "file" -}}
{{- include "gluetun.options.required" (dict "rootCtx" $
"options" (list
"openvpnCertHostPath"
"openvpnKeyHostPath")) -}}
{{- $req = (list "openvpnCertHostPath" "openvpnKeyHostPath") -}}
{{- else if eq .Values.gluetunConfig.openvpnCertKeyMethod "content" -}}
{{- include "gluetun.options.required" (dict "rootCtx" $
"options" (list
"openvpnCert"
"openvpnKey")) -}}
{{- $req = (list "openvpnCert" "openvpnKey") -}}
{{- else -}}
{{- include "gluetun.certkey.required.error" $ -}}
{{- end -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- end -}}
{{- define "gluetun.airvpn.wireguard.validation" -}}
{{/* Required */}}
{{- include "gluetun.options.required" (dict "rootCtx" $
"options" (list
"wireguardPrivateKey"
"wireguardPresharedKey"
"wireguardAddresses")) -}}
{{- $req := (list "wireguardPrivateKey" "wireguardPresharedKey" "wireguardAddresses") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- end -}}
library/ix-dev/community/gluetun/templates/providers/_cyberghost.tpl
+11 -20
View File
@@ -1,30 +1,21 @@
{{/* https://github.com/qdm12/gluetun/wiki/Cyberghost */}}
{{- define "gluetun.cyberghost.openvpn.validation" -}}
{{/* Cert and Key Required */}}
{{- $req := list -}}
{{- if eq .Values.gluetunConfig.openvpnCertKeyMethod "file" -}}
{{- include "gluetun.options.required" (dict "rootCtx" $
"options" (list
"openvpnCertHostPath"
"openvpnKeyHostPath")) -}}
{{- $req = (list "openvpnCertHostPath" "openvpnKeyHostPath") -}}
{{- else if eq .Values.gluetunConfig.openvpnCertKeyMethod "content" -}}
{{- include "gluetun.options.required" (dict "rootCtx" $
"options" (list
"openvpnCert"
"openvpnKey")) -}}
{{- $req = (list "openvpnCert" "openvpnKey") -}}
{{- else -}}
{{- include "gluetun.certkey.required.error" $ -}}
{{- end -}}
{{/* Required */}}
{{- include "gluetun.options.required" (dict "rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{/* Unsupported */}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $
"options" (list
"serverRegions"
"serverCities"
"serverNames")) -}}
{{- $req = concat $req (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverRegions" "serverCities" "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.cyberghost.wireguard.validation" -}}
library/ix-dev/community/gluetun/templates/providers/_expressvpn.tpl
+6 -10
View File
@@ -1,15 +1,11 @@
{{/* https://github.com/qdm12/gluetun/wiki/ExpressVPN */}}
{{- define "gluetun.expressvpn.openvpn.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverRegions"
"serverNames")) -}}
{{- $req := (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverRegions" "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.expressvpn.wireguard.validation" -}}
library/ix-dev/community/gluetun/templates/providers/_fastestvpn.tpl
+6 -11
View File
@@ -1,16 +1,11 @@
{{/* https://github.com/qdm12/gluetun/wiki/FastestVPN */}}
{{- define "gluetun.fastestvpn.openvpn.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverRegions"
"serverCities"
"serverNames")) -}}
{{- $req := (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverRegions" "serverCities" "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.fastestvpn.wireguard.validation" -}}
library/ix-dev/community/gluetun/templates/providers/_hidemyass.tpl
+6 -9
View File
@@ -1,14 +1,11 @@
{{/* https://github.com/qdm12/gluetun/wiki/Hidemyass */}}
{{- define "gluetun.hidemyass.openvpn.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverNames")) -}}
{{- $req := (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.hidemyass.wireguard.validation" -}}
library/ix-dev/community/gluetun/templates/providers/_ipvanish.tpl
+6 -10
View File
@@ -1,15 +1,11 @@
{{/* https://github.com/qdm12/gluetun/wiki/IPVanish */}}
{{- define "gluetun.ipvanish.openvpn.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverRegions"
"serverNames")) -}}
{{- $req := (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverRegions" "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.ipvanish.wireguard.validation" -}}
library/ix-dev/community/gluetun/templates/providers/_ivpn.tpl
+12 -19
View File
@@ -1,25 +1,18 @@
{{/* https://github.com/qdm12/gluetun/wiki/IVPN */}}
{{- define "gluetun.ivpn.openvpn.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"openvpnUser")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverRegions"
"serverNames")) -}}
{{- $req := (list "openvpnUser") -}}
{{- $unsup := (list "serverRegions" "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.ivpn.wireguard.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"wireguardPrivateKey"
"wireguardAddresses")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverRegions"
"serverNames")) -}}
{{- $req := (list "wireguardPrivateKey" "wireguardAddresses") -}}
{{- $unsup := (list "serverRegions" "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
library/ix-dev/community/gluetun/templates/providers/_mullvad.tpl
+12 -19
View File
@@ -1,25 +1,18 @@
{{/* https://github.com/qdm12/gluetun/wiki/Mullvad */}}
{{- define "gluetun.mullvad.openvpn.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"openvpnUser")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverRegions"
"serverNames")) -}}
{{- $req := (list "openvpnUser") -}}
{{- $unsup := (list "serverRegions" "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.mullvad.wireguard.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"wireguardPrivateKey"
"wireguardAddresses")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverRegions"
"serverNames")) -}}
{{- $req := (list "wireguardPrivateKey" "wireguardAddresses") -}}
{{- $unsup := (list "serverRegions" "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
library/ix-dev/community/gluetun/templates/providers/_nordvpn.tpl
+6 -11
View File
@@ -1,16 +1,11 @@
{{/* https://github.com/qdm12/gluetun/wiki/NordVPN */}}
{{- define "gluetun.nordvpn.openvpn.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverCountries"
"serverCities"
"serverNames")) -}}
{{- $req := (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverCountries" "serverCities" "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.nordvpn.wireguard.validation" -}}
library/ix-dev/community/gluetun/templates/providers/_perfectprivacy.tpl
+6 -12
View File
@@ -1,17 +1,11 @@
{{/* https://github.com/qdm12/gluetun/wiki/Perfect-privacy */}}
{{- define "gluetun.perfect privacy.openvpn.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverCountries"
"serverRegions"
"serverHostnames"
"serverNames")) -}}
{{- $req := (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverRegions" "serverCountries" "serverHostnames" "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.perfect privacy.wireguard.validation" -}}
library/ix-dev/community/gluetun/templates/providers/_privado.tpl
+6 -9
View File
@@ -1,14 +1,11 @@
{{/* https://github.com/qdm12/gluetun/wiki/Privado */}}
{{- define "gluetun.privado.openvpn.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverNames")) -}}
{{- $req := (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.privado.wireguard.validation" -}}
library/ix-dev/community/gluetun/templates/providers/_privateinternetaccess.tpl
+6 -10
View File
@@ -1,15 +1,11 @@
{{/* https://github.com/qdm12/gluetun/wiki/Private-internet-access */}}
{{- define "gluetun.private internet access.openvpn.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverCities"
"serverCountries")) -}}
{{- $req := (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverCities" "serverCountries") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.private internet access.wireguard.validation" -}}
library/ix-dev/community/gluetun/templates/providers/_privatevpn.tpl
+6 -11
View File
@@ -1,16 +1,11 @@
{{/* https://github.com/qdm12/gluetun/wiki/PrivateVPN */}}
{{- define "gluetun.privatevpn.openvpn.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverRegions"
"serverHostnames"
"serverNames")) -}}
{{- $req := (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverRegions" "serverHostnames" "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.privatevpn.wireguard.validation" -}}
library/ix-dev/community/gluetun/templates/providers/_protonvpn.tpl
+6 -9
View File
@@ -1,14 +1,11 @@
{{/* https://github.com/qdm12/gluetun/wiki/ProtonVPN */}}
{{- define "gluetun.protonvpn.openvpn.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverNames")) -}}
{{- $req := (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.protonvpn.wireguard.validation" -}}
library/ix-dev/community/gluetun/templates/providers/_purevpn.tpl
+6 -9
View File
@@ -1,14 +1,11 @@
{{/* https://github.com/qdm12/gluetun/wiki/PureVPN */}}
{{- define "gluetun.purevpn.openvpn.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverNames")) -}}
{{- $req := (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.purevpn.wireguard.validation" -}}
library/ix-dev/community/gluetun/templates/providers/_slickvpn.tpl
+11 -18
View File
@@ -1,28 +1,21 @@
{{/* https://github.com/qdm12/gluetun/wiki/SlickVPN */}}
{{- define "gluetun.slickvpn.openvpn.validation" -}}
{{/* Cert and Key Required */}}
{{- $req := list -}}
{{- if eq .Values.gluetunConfig.openvpnCertKeyMethod "file" -}}
{{- include "gluetun.options.required" (dict "rootCtx" $
"options" (list
"openvpnCertHostPath"
"openvpnKeyHostPath")) -}}
{{- $req = (list "openvpnCertHostPath" "openvpnKeyHostPath") -}}
{{- else if eq .Values.gluetunConfig.openvpnCertKeyMethod "content" -}}
{{- include "gluetun.options.required" (dict "rootCtx" $
"options" (list
"openvpnCert"
"openvpnKey")) -}}
{{- $req = (list "openvpnCert" "openvpnKey") -}}
{{- else -}}
{{- include "gluetun.certkey.required.error" $ -}}
{{- end -}}
{{/* Required */}}
{{- include "gluetun.options.required" (dict "rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{/* Unsupported */}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $
"options" (list
"serverNames")) -}}
{{- $req = concat $req (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.slickvpn.wireguard.validation" -}}
library/ix-dev/community/gluetun/templates/providers/_surfshark.tpl
+12 -18
View File
@@ -1,24 +1,18 @@
{{/* https://github.com/qdm12/gluetun/wiki/Surfshark */}}
{{- define "gluetun.surfshark.openvpn.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverNames")) -}}
{{- $req := (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.surfshark.wireguard.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"wireguardPrivateKey"
"wireguardAddresses")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverNames")) -}}
{{- $req := (list "wireguardPrivateKey" "wireguardAddresses") -}}
{{- $unsup := (list "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
library/ix-dev/community/gluetun/templates/providers/_torguard.tpl
+6 -10
View File
@@ -1,15 +1,11 @@
{{/* https://github.com/qdm12/gluetun/wiki/Torguard */}}
{{- define "gluetun.torguard.openvpn.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverRegions"
"serverNames")) -}}
{{- $req := (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverRegions" "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.torguard.wireguard.validation" -}}
library/ix-dev/community/gluetun/templates/providers/_vpnsecure.tpl
+11 -18
View File
@@ -1,28 +1,21 @@
{{/* https://github.com/qdm12/gluetun/wiki/VPN-Secure */}}
{{- define "gluetun.vpnsecure.openvpn.validation" -}}
{{/* Cert and Key Required */}}
{{- $req := list -}}
{{- if eq .Values.gluetunConfig.openvpnCertKeyMethod "file" -}}
{{- include "gluetun.options.required" (dict "rootCtx" $
"options" (list
"openvpnCertHostPath"
"openvpnKeyHostPath")) -}}
{{- $req = (list "openvpnCertHostPath" "openvpnKeyHostPath") -}}
{{- else if eq .Values.gluetunConfig.openvpnCertKeyMethod "content" -}}
{{- include "gluetun.options.required" (dict "rootCtx" $
"options" (list
"openvpnCert"
"openvpnKey")) -}}
{{- $req = (list "openvpnCert" "openvpnKey") -}}
{{- else -}}
{{- include "gluetun.certkey.required.error" $ -}}
{{- end -}}
{{/* Required */}}
{{- include "gluetun.options.required" (dict "rootCtx" $
"options" (list
"openvpnKeyPassphrase")) -}}
{{/* Unsupported */}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $
"options" (list
"serverCountries"
"serverNames")) -}}
{{- $req = concat $req (list "openvpnKeyPassphrase") -}}
{{- $unsup := (list "serverCountries" "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.vpnsecure.wireguard.validation" -}}
library/ix-dev/community/gluetun/templates/providers/_vpnunlimited.tpl
+11 -18
View File
@@ -1,28 +1,21 @@
{{/* https://github.com/qdm12/gluetun/wiki/VPN-Unlimited */}}
{{- define "gluetun.vpn unlimited.openvpn.validation" -}}
{{/* Cert and Key Required */}}
{{- $req := list -}}
{{- if eq .Values.gluetunConfig.openvpnCertKeyMethod "file" -}}
{{- include "gluetun.options.required" (dict "rootCtx" $
"options" (list
"openvpnCertHostPath"
"openvpnKeyHostPath")) -}}
{{- $req = (list "openvpnCertHostPath" "openvpnKeyHostPath") -}}
{{- else if eq .Values.gluetunConfig.openvpnCertKeyMethod "content" -}}
{{- include "gluetun.options.required" (dict "rootCtx" $
"options" (list
"openvpnCert"
"openvpnKey")) -}}
{{- $req = (list "openvpnCert" "openvpnKey") -}}
{{- else -}}
{{- include "gluetun.certkey.required.error" $ -}}
{{- end -}}
{{/* Required */}}
{{- include "gluetun.options.required" (dict "rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{/* Unsupported */}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $
"options" (list
"serverNames")) -}}
{{- $req = concat $req (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.vpn unlimited.wireguard.validation" -}}
library/ix-dev/community/gluetun/templates/providers/_vyprvpn.tpl
+6 -11
View File
@@ -1,16 +1,11 @@
{{/* https://github.com/qdm12/gluetun/wiki/VyprVPN */}}
{{- define "gluetun.vyprvpn.openvpn.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverCountries"
"serverCities"
"serverNames")) -}}
{{- $req := (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverCountries" "serverCities" "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.vyprvpn.wireguard.validation" -}}
library/ix-dev/community/gluetun/templates/providers/_wevpn.tpl
+10 -16
View File
@@ -1,27 +1,21 @@
{{/* https://github.com/qdm12/gluetun/wiki/WeVPN */}}
{{- define "gluetun.wevpn.openvpn.validation" -}}
{{/* Cert and Key Required */}}
{{- $req := list -}}
{{- if eq .Values.gluetunConfig.openvpnCertKeyMethod "file" -}}
{{- include "gluetun.options.required" (dict "rootCtx" $
"options" (list "openvpnKeyHostPath")) -}}
{{- $req = (list "openvpnKeyHostPath") -}}
{{- else if eq .Values.gluetunConfig.openvpnCertKeyMethod "content" -}}
{{- include "gluetun.options.required" (dict "rootCtx" $
"options" (list "openvpnKey")) -}}
{{- $req = (list "openvpnKey") -}}
{{- else -}}
{{- include "gluetun.certkey.required.error" $ -}}
{{- end -}}
{{/* Required */}}
{{- include "gluetun.options.required" (dict "rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{/* Unsupported */}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $
"options" (list
"serverCountries"
"serverRegions"
"serverNames")) -}}
{{- $req = concat $req (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverRegions" "serverCountries" "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.wevpn.wireguard.validation" -}}
library/ix-dev/community/gluetun/templates/providers/_windscribe.tpl
+12 -20
View File
@@ -1,26 +1,18 @@
{{/* https://github.com/qdm12/gluetun/wiki/Windscribe */}}
{{- define "gluetun.windscribe.openvpn.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"openvpnUser"
"openvpnPassword")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverCountries"
"serverNames")) -}}
{{- $req := (list "openvpnUser" "openvpnPassword") -}}
{{- $unsup := (list "serverCountries" "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
{{- define "gluetun.windscribe.wireguard.validation" -}}
{{- include "gluetun.options.required" (dict
"rootCtx" $
"options" (list
"wireguardPrivateKey"
"wireguardAddresses")) -}}
{{- include "gluetun.unsupported.server.options" (dict
"rootCtx" $
"options" (list
"serverCountries"
"serverNames")) -}}
{{- $req := (list "wireguardPrivateKey" "wireguardAddresses") -}}
{{- $unsup := (list "serverCountries" "serverNames") -}}
{{- include "gluetun.options.required" (dict "rootCtx" $ "options" $req) -}}
{{- include "gluetun.unsupported.server.options" (dict "rootCtx" $ "options" $unsup) -}}
{{- end -}}
library/ix-dev/community/gluetun/values.yaml
+3
View File
@@ -56,3 +56,6 @@ gluetunConfig:
serverNames: []
additionalEnvs: []
# TODO: custom provider test
# TODO: openvpn file test