yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-04-28 06:05:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove isAutoconf option to GenerateConfig

Browse source
This commit is contained in:
Neil Alexander 2019-03-12 19:18:43 +00:00
parent 4062c93e18
commit 41872820c3
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/yggdrasil/main.go
View file

@ -62,7 +62,7 @@ func readConfig(useconf *bool, useconffile *string, normaliseconf *bool) *nodeCo
// then parse the configuration we loaded above on top of it. The effect
// of this is that any configuration item that is missing from the provided
// configuration will use a sane default.
cfg := config.GenerateConfig(false)
cfg := config.GenerateConfig()
var dat map[string]interface{}
if err := hjson.Unmarshal(conf, &dat); err != nil {
panic(err)
@ -154,7 +154,7 @@ func readConfig(useconf *bool, useconffile *string, normaliseconf *bool) *nodeCo
// Generates a new configuration and returns it in HJSON format. This is used
// with -genconf.
func doGenconf(isjson bool) string {
cfg := config.GenerateConfig(false)
cfg := config.GenerateConfig()
var bs []byte
var err error
if isjson {
@ -191,7 +191,7 @@ func main() {
case *autoconf:
// Use an autoconf-generated config, this will give us random keys and
// port numbers, and will use an automatically selected TUN/TAP interface.
cfg = config.GenerateConfig(true)
cfg = config.GenerateConfig()
case *useconffile != "" || *useconf:
// Read the configuration from either stdin or from the filesystem
cfg = readConfig(useconf, useconffile, normaliseconf)