Updated .gitignore

This commit is contained in:
Ev Kontsevoy 2016-03-03 18:02:48 -08:00
parent 5e4635b269
commit 1bd10be0f8
5 changed files with 14 additions and 3 deletions

3
.gitignore vendored
View file

@ -1,4 +1,5 @@
web/dist/app/app
# Ev: this is temporary
assets/docker
# Compiled binaries, Object files, Static and Dynamic libs (Shared Objects)
out

View file

@ -57,6 +57,10 @@ type Config struct {
// via multiple reverse tunnels
Proxy ProxyConfig
// Unique UUID of this host (it will be known via this UUID within
// a teleport cluster). It's automatically generated on 1st start
HostUUID string
// Console writer to speak to a user
Console io.Writer
}

View file

@ -76,6 +76,12 @@ func NewTeleport(cfg Config) (Supervisor, error) {
}
}
// read or generate a host UUID for this node
cfg.HostUUID, err = utils.ReadOrMakeHostUUID(cfg.DataDir)
if err != nil {
return nil, trace.Wrap(err)
}
// if user started auth and another service (without providing the auth address for
// that service, the address of the in-process auth will be used
if cfg.Auth.Enabled && len(cfg.AuthServers) == 0 {

View file

@ -160,11 +160,11 @@ func New(addr utils.NetAddr,
advertiseIP net.IP,
options ...ServerOption) (*Server, error) {
// read the host UUID:
uuid, err := utils.ReadOrMakeHostUUID(dataDir)
if err != nil {
return nil, trace.Wrap(err)
}
log.Infof("node UUID: %v", uuid)
s := &Server{
addr: addr,

2
web/dist/app/app vendored
View file

@ -1 +1 @@
/Users/ekontsevoy/go/src/github.com/gravitational/teleport/web/dist/app
/home/ekontsevoy/go/src/github.com/gravitational/teleport/web/dist/app