MyFavMirrors/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-12-26 14:15:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make ACL policy part of the config struct

Browse Source
This commit is contained in:
Kristoffer Dalby 2022-05-31 12:50:16 +02:00
parent 5bfae22c8f
commit 24e4787a64
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app.go
View File

@ -116,6 +116,8 @@ type Config struct {
LogTail LogTailConfig LogTail LogTailConfig
CLI CLIConfig CLI CLIConfig
ACL ACLConfig
} }
type OIDCConfig struct { type OIDCConfig struct {
@ -152,6 +154,10 @@ type CLIConfig struct {
Insecure bool Insecure bool
} }
type ACLConfig struct {
PolicyPath string
}
// Headscale represents the base app of the service. // Headscale represents the base app of the service.
type Headscale struct { type Headscale struct {
cfg Config cfg Config

10
cmd/headscale/cli/utils.go
View File

@ -177,6 +177,14 @@ func GetLogTailConfig() headscale.LogTailConfig {
} }
} }
func GetACLConfig() headscale.ACLConfig {
policyPath := viper.GetString("acl_policy_path")
return headscale.ACLConfig{
PolicyPath: policyPath,
}
}
func GetDNSConfig() (*tailcfg.DNSConfig, string) { func GetDNSConfig() (*tailcfg.DNSConfig, string) {
if viper.IsSet("dns_config") { if viper.IsSet("dns_config") {
dnsConfig := &tailcfg.DNSConfig{} dnsConfig := &tailcfg.DNSConfig{}
@ -397,6 +405,8 @@ func GetHeadscaleConfig() headscale.Config {
Timeout: viper.GetDuration("cli.timeout"), Timeout: viper.GetDuration("cli.timeout"),
Insecure: viper.GetBool("cli.insecure"), Insecure: viper.GetBool("cli.insecure"),
}, },
ACL: GetACLConfig(),
} }
} }