From a340041c24815f35b0a2375d900f464749d0bcbf Mon Sep 17 00:00:00 2001 From: ersonp Date: Tue, 8 Jun 2021 16:24:37 +0530 Subject: [PATCH] Remove Dmsgpty.AuthFile from config --- pkg/visor/visorconfig/config.go | 14 ++++++-------- pkg/visor/visorconfig/v1.go | 7 +++---- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pkg/visor/visorconfig/config.go b/pkg/visor/visorconfig/config.go index 18195ae90..180230f5a 100644 --- a/pkg/visor/visorconfig/config.go +++ b/pkg/visor/visorconfig/config.go @@ -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{ @@ -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{ diff --git a/pkg/visor/visorconfig/v1.go b/pkg/visor/visorconfig/v1.go index 040c6d98b..10231a214 100644 --- a/pkg/visor/visorconfig/v1.go +++ b/pkg/visor/visorconfig/v1.go @@ -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.