devproje/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-26 17:03:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #248 from negbie/main

Browse source
This commit is contained in:
Kristoffer Dalby 2021-12-07 11:07:03 +00:00 committed by GitHub
commit 3fb3db6f20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -17,6 +17,8 @@
/headscale /headscale
config.json config.json
config.yaml config.yaml
derp.yaml
*.hujson
*.key *.key
/db.sqlite /db.sqlite
*.sqlite3 *.sqlite3

7
acls.go
View file

@ -34,6 +34,11 @@ const (
// LoadACLPolicy loads the ACL policy from the specify path, and generates the ACL rules. // LoadACLPolicy loads the ACL policy from the specify path, and generates the ACL rules.
func (h *Headscale) LoadACLPolicy(path string) error { func (h *Headscale) LoadACLPolicy(path string) error {
log.Debug().
Str("func", "LoadACLPolicy").
Str("path", path).
Msg("Loading ACL policy from path")
policyFile, err := os.Open(path) policyFile, err := os.Open(path)
if err != nil { if err != nil {
return err return err
@ -67,6 +72,8 @@ func (h *Headscale) LoadACLPolicy(path string) error {
} }
h.aclRules = rules h.aclRules = rules
log.Trace().Interface("ACL", rules).Msg("ACL rules generated")
return nil return nil
} }

6
app.go
View file

@ -418,12 +418,12 @@ func (h *Headscale) Serve() error {
err = h.ensureUnixSocketIsAbsent() err = h.ensureUnixSocketIsAbsent()
if err != nil { if err != nil {
panic(err) return fmt.Errorf("unable to remove old socket file: %w", err)
} }
socketListener, err := net.Listen("unix", h.cfg.UnixSocket) socketListener, err := net.Listen("unix", h.cfg.UnixSocket)
if err != nil { if err != nil {
panic(err) return fmt.Errorf("failed to set up gRPC socket: %w", err)
} }
// Handle common process-killing signals so we can gracefully shut down: // Handle common process-killing signals so we can gracefully shut down:
@ -441,7 +441,7 @@ func (h *Headscale) Serve() error {
networkListener, err := net.Listen("tcp", h.cfg.Addr) networkListener, err := net.Listen("tcp", h.cfg.Addr)
if err != nil { if err != nil {
panic(err) return fmt.Errorf("failed to bind to TCP address: %w", err)
} }
// Create the cmux object that will multiplex 2 protocols on the same port. // Create the cmux object that will multiplex 2 protocols on the same port.

2
config-example.yaml
View file

@ -54,6 +54,8 @@ tls_letsencrypt_challenge_type: HTTP-01
tls_cert_path: "" tls_cert_path: ""
tls_key_path: "" tls_key_path: ""
log_level: info
# Path to a file containg ACL policies. # Path to a file containg ACL policies.
acl_policy_path: "" acl_policy_path: ""