diff --git a/bridge/config/config.go b/bridge/config/config.go index d06706e8..28fe004d 100644 --- a/bridge/config/config.go +++ b/bridge/config/config.go @@ -139,6 +139,7 @@ type Protocol struct { NickServPassword string // IRC NicksPerRow int // mattermost, slack NoHomeServerSuffix bool // matrix + NodeConfigFile string // status NoSendJoinPart bool // all protocols NoTLS bool // mattermost, xmpp Password string // IRC,mattermost,XMPP,matrix diff --git a/bridge/status/status.go b/bridge/status/status.go index 08f47a7a..85321c7e 100644 --- a/bridge/status/status.go +++ b/bridge/status/status.go @@ -55,7 +55,8 @@ type Bstatus struct { statusListenPort int statusListenAddr string - statusDataDir string + statusDataDir string + statusNodeConfigFile string privateKey *ecdsa.PrivateKey nodeConfig *params.NodeConfig @@ -67,12 +68,13 @@ type Bstatus struct { func New(cfg *bridge.Config) bridge.Bridger { return &Bstatus{ - Config: cfg, - fetchDone: make(chan bool), - statusListenPort: 30303, - statusListenAddr: "0.0.0.0", - statusDataDir: cfg.GetString("DataDir"), - fetchInterval: 500 * time.Millisecond, + Config: cfg, + fetchDone: make(chan bool), + statusListenPort: 30303, + statusListenAddr: "0.0.0.0", + statusDataDir: cfg.GetString("DataDir"), + statusNodeConfigFile: cfg.GetString("NodeConfigFile"), + fetchInterval: 500 * time.Millisecond, } } @@ -81,7 +83,7 @@ func (b *Bstatus) generateNodeConfig() (*params.NodeConfig, error) { options := []params.Option{ b.withListenAddr(), } - configFiles := []string{"./fleet.json"} + configFiles := []string{b.statusNodeConfigFile} config, err := params.NewNodeConfigWithDefaultsAndFiles( b.statusDataDir, params.MainNetworkID, diff --git a/fleet.json b/config/fleet.json similarity index 100% rename from fleet.json rename to config/fleet.json diff --git a/status.toml b/status.toml index b4b55a05..fadbaa3c 100644 --- a/status.toml +++ b/status.toml @@ -11,6 +11,7 @@ Token="" RemoteNickFormat="{NICK}" DataDir="path to status data dir" + NodeConfigFile="path to json with node config and fleets" [discord] [discord.mydiscord]