Merge branch 'master' into openapi-v3
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org> # Conflicts: # outpost/pkg/ak/api.go # outpost/pkg/ak/global.go # outpost/pkg/ldap/instance_bind.go
This commit is contained in:
commit
ab2bd622a8
|
@ -88,10 +88,10 @@ class ConfigLoader:
|
|||
value = os.getenv(url.netloc, url.query)
|
||||
if url.scheme == "file":
|
||||
try:
|
||||
with open(url.netloc, "r") as _file:
|
||||
with open(url.path, "r") as _file:
|
||||
value = _file.read()
|
||||
except OSError:
|
||||
self._log("error", f"Failed to read config value from {url.netloc}")
|
||||
self._log("error", f"Failed to read config value from {url.path}")
|
||||
value = url.query
|
||||
return value
|
||||
|
||||
|
|
|
@ -52,6 +52,7 @@ func doGlobalSetup(config map[string]interface{}) {
|
|||
defer sentry.Flush(2 * time.Second)
|
||||
}
|
||||
|
||||
// GetTLSTransport Get a TLS transport instance, that skips verification if configured via environment variables.
|
||||
func GetTLSTransport() http.RoundTripper {
|
||||
value, set := os.LookupEnv("AUTHENTIK_INSECURE")
|
||||
if !set {
|
||||
|
|
Reference in New Issue