Cyberghost: read client key as file, see #179

This commit is contained in:
Quentin McGaw
2020-07-14 00:17:31 +00:00
parent e3a677c22b
commit 7e7312459d
5 changed files with 46 additions and 23 deletions

View File

@@ -58,11 +58,6 @@ func _main(background context.Context, args []string) int {
logger := createLogger()
wg := &sync.WaitGroup{}
fatalOnError := makeFatalOnError(logger, cancel, wg)
paramsReader := params.NewReader(logger)
fmt.Println(gluetunLogging.Splash(
paramsReader.GetVersion(),
paramsReader.GetVcsRef(),
paramsReader.GetBuildDate()))
client := network.NewClient(15 * time.Second)
// Create configurators
@@ -76,6 +71,12 @@ func _main(background context.Context, args []string) int {
shadowsocksConf := shadowsocks.NewConfigurator(fileManager, logger)
streamMerger := command.NewStreamMerger()
paramsReader := params.NewReader(logger, fileManager)
fmt.Println(gluetunLogging.Splash(
paramsReader.GetVersion(),
paramsReader.GetVcsRef(),
paramsReader.GetBuildDate()))
printVersions(ctx, logger, map[string]func(ctx context.Context) (string, error){
"OpenVPN": ovpnConf.Version,
"Unbound": dnsConf.Version,