Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Fix certificate path in development config (#55)

Browse source 
Also adds error checking to `RunTLS`
This commit is contained in:
Zachary Wasserman 2016-08-09 16:18:03 -07:00 committed by GitHub
parent 2ee93d4724
commit 2c15647b6e
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/config.go
View file

@ -42,8 +42,8 @@ var defaultMySQLConfigData = MySQLConfigData{
var defaultServerConfigData = ServerConfigData{
Address: "127.0.0.1:8080",
Cert: "./tools/kolide.crt",
Key: "./tools/kolide.key",
Cert: "./tools/osquery/kolide.crt",
Key: "./tools/osquery/kolide.key",
}
var defaultAppConfigData = AppConfigData{

5
kolide.go
View file

@ -151,10 +151,13 @@ $7777777....$....$777$.....+DI..DDD..DDI...8D...D8......$D:..8D....8D...8D......
fmt.Println("Use Ctrl-C to stop")
fmt.Print("\n\n")
app.CreateServer(db, os.Stderr).RunTLS(
err = app.CreateServer(db, os.Stderr).RunTLS(
config.Server.Address,
config.Server.Cert,
config.Server.Key)
if err != nil {
logrus.WithError(err).Fatal("Error running server")
}
}
}

6
tools/app/example_config.json
View file

@ -7,8 +7,8 @@
},
"server": {
"address": ":8080",
"cert": "./tools/kolide.crt",
"key": "./tools/kolide.key"
"cert": "./tools/osquery/kolide.crt",
"key": "./tools/osquery/kolide.key"
},
"app": {
"bcrypt_cost": 12,
@ -19,4 +19,4 @@
"osquery": {
"enroll_secret": "super secure"
}
}
}