lug/matterbridge
10
0
Fork 2
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Passing node config file via .toml file

Browse Source 
Fix #3
This commit is contained in:
Michal Iskierko 2024-03-12 11:09:08 +01:00 committed by Michał Iskierko
parent 1c7da47b09
commit 95389601c5
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bridge/config/config.go
View File

@ -139,6 +139,7 @@ type Protocol struct {
NickServPassword string // IRC NickServPassword string // IRC
NicksPerRow int // mattermost, slack NicksPerRow int // mattermost, slack
NoHomeServerSuffix bool // matrix NoHomeServerSuffix bool // matrix
NodeConfigFile string // status
NoSendJoinPart bool // all protocols NoSendJoinPart bool // all protocols
NoTLS bool // mattermost, xmpp NoTLS bool // mattermost, xmpp
Password string // IRC,mattermost,XMPP,matrix Password string // IRC,mattermost,XMPP,matrix

18
bridge/status/status.go
View File

@ -55,7 +55,8 @@ type Bstatus struct {
statusListenPort int statusListenPort int
statusListenAddr string statusListenAddr string
statusDataDir string statusDataDir string
statusNodeConfigFile string
privateKey *ecdsa.PrivateKey privateKey *ecdsa.PrivateKey
nodeConfig *params.NodeConfig nodeConfig *params.NodeConfig
@ -67,12 +68,13 @@ type Bstatus struct {
func New(cfg *bridge.Config) bridge.Bridger { func New(cfg *bridge.Config) bridge.Bridger {
return &Bstatus{ return &Bstatus{
Config: cfg, Config: cfg,
fetchDone: make(chan bool), fetchDone: make(chan bool),
statusListenPort: 30303, statusListenPort: 30303,
statusListenAddr: "0.0.0.0", statusListenAddr: "0.0.0.0",
statusDataDir: cfg.GetString("DataDir"), statusDataDir: cfg.GetString("DataDir"),
fetchInterval: 500 * time.Millisecond, statusNodeConfigFile: cfg.GetString("NodeConfigFile"),
fetchInterval: 500 * time.Millisecond,
} }
} }
@ -81,7 +83,7 @@ func (b *Bstatus) generateNodeConfig() (*params.NodeConfig, error) {
options := []params.Option{ options := []params.Option{
b.withListenAddr(), b.withListenAddr(),
} }
configFiles := []string{"./fleet.json"} configFiles := []string{b.statusNodeConfigFile}
config, err := params.NewNodeConfigWithDefaultsAndFiles( config, err := params.NewNodeConfigWithDefaultsAndFiles(
b.statusDataDir, b.statusDataDir,
params.MainNetworkID, params.MainNetworkID,

0
fleet.json → config/fleet.json
View File

1
status.toml
View File

@ -11,6 +11,7 @@
Token="" Token=""
RemoteNickFormat="{NICK}" RemoteNickFormat="{NICK}"
DataDir="path to status data dir" DataDir="path to status data dir"
NodeConfigFile="path to json with node config and fleets"
[discord] [discord]
[discord.mydiscord] [discord.mydiscord]