Merge branch 'main' into main

This commit is contained in:
Kristoffer Dalby
2021-10-08 22:21:41 +01:00
committed by GitHub
18 changed files with 651 additions and 387 deletions

View File

@@ -179,6 +179,9 @@ func getHeadscaleApp() (*headscale.Headscale, error) {
TLSCertPath: absPath(viper.GetString("tls_cert_path")),
TLSKeyPath: absPath(viper.GetString("tls_key_path")),
ACMEEmail: viper.GetString("acme_email"),
ACMEURL: viper.GetString("acme_url"),
DNSConfig: GetDNSConfig(),
OIDCIssuer: viper.GetString("oidc_issuer"),