Skip to content

Commit

Permalink
Remove Dmsgpty.AuthFile from config
Browse files Browse the repository at this point in the history
  • Loading branch information
ersonp committed Jun 8, 2021
1 parent 25d184a commit a340041
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 12 deletions.
14 changes: 6 additions & 8 deletions pkg/visor/visorconfig/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,9 @@ func defaultConfigFromCommon(cc *Common, hypervisor bool) (*V1, error) {
conf := MakeBaseConfig(cc)

conf.Dmsgpty = &V1Dmsgpty{
Port: skyenv.DmsgPtyPort,
AuthFile: skyenv.DefaultDmsgPtyWhitelist,
CLINet: skyenv.DefaultDmsgPtyCLINet,
CLIAddr: skyenv.DefaultDmsgPtyCLIAddr,
Port: skyenv.DmsgPtyPort,
CLINet: skyenv.DefaultDmsgPtyCLINet,
CLIAddr: skyenv.DefaultDmsgPtyCLIAddr,
}

conf.STCP = &snet.STCPConfig{
Expand Down Expand Up @@ -157,10 +156,9 @@ func MakePackageConfig(log *logging.MasterLogger, confPath string, sk *cipher.Se
}

conf.Dmsgpty = &V1Dmsgpty{
Port: skyenv.DmsgPtyPort,
AuthFile: skyenv.PackageDmsgPtyWhiteList,
CLINet: skyenv.DefaultDmsgPtyCLINet,
CLIAddr: skyenv.DefaultDmsgPtyCLIAddr,
Port: skyenv.DmsgPtyPort,
CLINet: skyenv.DefaultDmsgPtyCLINet,
CLIAddr: skyenv.DefaultDmsgPtyCLIAddr,
}

conf.Transport.LogStore = &V1LogStore{
Expand Down
7 changes: 3 additions & 4 deletions pkg/visor/visorconfig/v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,9 @@ type V1 struct {

// V1Dmsgpty configures the dmsgpty-host.
type V1Dmsgpty struct {
Port uint16 `json:"port"`
AuthFile string `json:"authorization_file"`
CLINet string `json:"cli_network"`
CLIAddr string `json:"cli_address"`
Port uint16 `json:"port"`
CLINet string `json:"cli_network"`
CLIAddr string `json:"cli_address"`
}

// V1Transport defines a transport config.
Expand Down

0 comments on commit a340041

Please sign in to comment.