extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-04-15 23:18:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move LetsEncryptDomain to HttpServer config

Browse Source
This commit is contained in:
braginini 2021-08-07 13:35:52 +02:00
parent 1f29975737
commit 08d44b1d5f
4 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
infrastructure_files/config.json
View File

@ -11,8 +11,8 @@
{ {
"Proto": "udp", "Proto": "udp",
"URI": "turn:stun.wiretrustee.com:3468", "URI": "turn:stun.wiretrustee.com:3468",
"Username": "some_turn_user", "Username": "some_user",
"Password": "some_turn_passwd" "Password": "c29tZV9wYXNzd29yZA=="
} }
], ],
"Signal": { "Signal": {
@ -20,5 +20,14 @@
"URI": "signal.wiretrustee.com:10000", "URI": "signal.wiretrustee.com:10000",
"Username": "", "Username": "",
"Password": null "Password": null
},
"Datadir": "",
"HttpConfig": {
"LetsEncryptDomain": "",
"Address": "0.0.0.0:3000",
"AuthDomain": "<PASTE YOUR AUTH0 DOMAIN HERE>",
"AuthClientId": "<PASTE YOUR AUTH0 CLIENT ID HERE>",
"AuthClientSecret": "<PASTE YOUR AUTH0 SECRET>",
"AuthCallback": "http://localhost:3000/callback"
} }
} }

6
management/cmd/management.go
View File

@ -59,8 +59,8 @@ var (
var opts []grpc.ServerOption var opts []grpc.ServerOption
var httpServer *http_server.Server var httpServer *http_server.Server
if config.LetsEncryptDomain != "" { if config.HttpConfig.LetsEncryptDomain != "" {
certManager := encryption.CreateCertManager(config.Datadir, config.LetsEncryptDomain) certManager := encryption.CreateCertManager(config.Datadir, config.HttpConfig.LetsEncryptDomain)
transportCredentials := credentials.NewTLS(certManager.TLSConfig()) transportCredentials := credentials.NewTLS(certManager.TLSConfig())
opts = append(opts, grpc.Creds(transportCredentials)) opts = append(opts, grpc.Creds(transportCredentials))
@ -119,7 +119,7 @@ func loadConfig() (*server.Config, error) {
return nil, err return nil, err
} }
if mgmtLetsencryptDomain != "" { if mgmtLetsencryptDomain != "" {
config.LetsEncryptDomain = mgmtLetsencryptDomain config.HttpConfig.LetsEncryptDomain = mgmtLetsencryptDomain
} }
if mgmtDataDir != "" { if mgmtDataDir != "" {
config.Datadir = mgmtDataDir config.Datadir = mgmtDataDir

15
management/server/config.go
View File

@ -16,18 +16,19 @@ type Config struct {
Turns []*Host Turns []*Host
Signal *Host Signal *Host
Datadir string Datadir string
LetsEncryptDomain string
HttpConfig *HttpServerConfig HttpConfig *HttpServerConfig
} }
// HttpServerConfig is a config of the HTTP Management service server
type HttpServerConfig struct { type HttpServerConfig struct {
Address string LetsEncryptDomain string
AuthDomain string Address string
AuthClientId string AuthDomain string
AuthClientSecret string AuthClientId string
AuthCallback string AuthClientSecret string
AuthCallback string
} }
// Host represents a Wiretrustee host (e.g. STUN, TURN, Signal) // Host represents a Wiretrustee host (e.g. STUN, TURN, Signal)

10
management/server/testdata/management.json vendored
View File

@ -21,5 +21,13 @@
"Username": "", "Username": "",
"Password": null "Password": null
}, },
"DataDir": "" "DataDir": "",
"HttpConfig": {
"LetsEncryptDomain": "",
"Address": "0.0.0.0:3000",
"AuthDomain": "<PASTE YOUR AUTH0 DOMAIN HERE>",
"AuthClientId": "<PASTE YOUR AUTH0 CLIENT ID HERE>",
"AuthClientSecret": "<PASTE YOUR AUTH0 SECRET>",
"AuthCallback": "http://localhost:3000/callback"
}
} }