Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-12-20 19:09:07 +01:00
Code Issues Projects Releases Wiki Activity

Switch config to pointer

Browse Source
This commit is contained in:
Kristoffer Dalby 2022-06-05 17:47:26 +02:00
parent af891808f6
commit 78ed610b50
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app.go
View File

@ -71,7 +71,7 @@ const (
// 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
db *gorm.DB db *gorm.DB
dbString string dbString string
dbType string dbType string
@ -115,7 +115,7 @@ func LookupTLSClientAuthMode(mode string) (tls.ClientAuthType, bool) {
} }
} }
func NewHeadscale(cfg Config) (*Headscale, error) { func NewHeadscale(cfg *Config) (*Headscale, error) {
privKey, err := readOrCreatePrivateKey(cfg.PrivateKeyPath) privKey, err := readOrCreatePrivateKey(cfg.PrivateKeyPath)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to read or create private key: %w", err) return nil, fmt.Errorf("failed to read or create private key: %w", err)

2
app_test.go
View File

@ -46,7 +46,7 @@ func (s *Suite) ResetDB(c *check.C) {
} }
app = Headscale{ app = Headscale{
cfg: cfg, cfg: &cfg,
dbType: "sqlite3", dbType: "sqlite3",
dbString: tmpDir + "/headscale_test.db", dbString: tmpDir + "/headscale_test.db",
} }

12
machine_test.go
View File

@ -821,7 +821,7 @@ func TestHeadscale_GenerateGivenName(t *testing.T) {
{ {
name: "simple machine name generation", name: "simple machine name generation",
h: &Headscale{ h: &Headscale{
cfg: Config{ cfg: &Config{
OIDC: OIDCConfig{ OIDC: OIDCConfig{
StripEmaildomain: true, StripEmaildomain: true,
}, },
@ -836,7 +836,7 @@ func TestHeadscale_GenerateGivenName(t *testing.T) {
{ {
name: "machine name with 53 chars", name: "machine name with 53 chars",
h: &Headscale{ h: &Headscale{
cfg: Config{ cfg: &Config{
OIDC: OIDCConfig{ OIDC: OIDCConfig{
StripEmaildomain: true, StripEmaildomain: true,
}, },
@ -851,7 +851,7 @@ func TestHeadscale_GenerateGivenName(t *testing.T) {
{ {
name: "machine name with 60 chars", name: "machine name with 60 chars",
h: &Headscale{ h: &Headscale{
cfg: Config{ cfg: &Config{
OIDC: OIDCConfig{ OIDC: OIDCConfig{
StripEmaildomain: true, StripEmaildomain: true,
}, },
@ -866,7 +866,7 @@ func TestHeadscale_GenerateGivenName(t *testing.T) {
{ {
name: "machine name with 63 chars", name: "machine name with 63 chars",
h: &Headscale{ h: &Headscale{
cfg: Config{ cfg: &Config{
OIDC: OIDCConfig{ OIDC: OIDCConfig{
StripEmaildomain: true, StripEmaildomain: true,
}, },
@ -881,7 +881,7 @@ func TestHeadscale_GenerateGivenName(t *testing.T) {
{ {
name: "machine name with 64 chars", name: "machine name with 64 chars",
h: &Headscale{ h: &Headscale{
cfg: Config{ cfg: &Config{
OIDC: OIDCConfig{ OIDC: OIDCConfig{
StripEmaildomain: true, StripEmaildomain: true,
}, },
@ -896,7 +896,7 @@ func TestHeadscale_GenerateGivenName(t *testing.T) {
{ {
name: "machine name with 73 chars", name: "machine name with 73 chars",
h: &Headscale{ h: &Headscale{
cfg: Config{ cfg: &Config{
OIDC: OIDCConfig{ OIDC: OIDCConfig{
StripEmaildomain: true, StripEmaildomain: true,
}, },