devproje/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-12-02 03:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix incorrect merge

Browse source
This commit is contained in:
Raal Goff 2021-10-16 22:34:11 +08:00
parent afbfc1d370
commit d0cd5af419
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/headscale/cli/utils.go
View file

@ -161,7 +161,6 @@ func getHeadscaleApp() (*headscale.Headscale, error) {
return nil, err return nil, err
} }
// maxMachineRegistrationDuration is the maximum time a client can request for a client registration // maxMachineRegistrationDuration is the maximum time a client can request for a client registration
maxMachineRegistrationDuration, _ := time.ParseDuration("10h") maxMachineRegistrationDuration, _ := time.ParseDuration("10h")
if viper.GetDuration("max_machine_registration_duration") >= time.Second { if viper.GetDuration("max_machine_registration_duration") >= time.Second {
@ -207,8 +206,6 @@ func getHeadscaleApp() (*headscale.Headscale, error) {
ACMEEmail: viper.GetString("acme_email"), ACMEEmail: viper.GetString("acme_email"),
ACMEURL: viper.GetString("acme_url"), ACMEURL: viper.GetString("acme_url"),
DNSConfig: GetDNSConfig(),
OIDCIssuer: viper.GetString("oidc_issuer"), OIDCIssuer: viper.GetString("oidc_issuer"),
OIDCClientID: viper.GetString("oidc_client_id"), OIDCClientID: viper.GetString("oidc_client_id"),
OIDCClientSecret: viper.GetString("oidc_client_secret"), OIDCClientSecret: viper.GetString("oidc_client_secret"),