Feature: OPENVPN_VERSION which can be 2.4 or 2.5

This commit is contained in:
Quentin McGaw (desktop)
2021-05-31 18:54:36 +00:00
parent 7002bf8e34
commit b829490aac
12 changed files with 71 additions and 23 deletions

View File

@@ -150,7 +150,8 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
if err := printVersions(ctx, logger, []printVersionElement{
{name: "Alpine", getVersion: alpineConf.Version},
{name: "OpenVPN", getVersion: ovpnConf.Version},
{name: "OpenVPN 2.4", getVersion: ovpnConf.Version24},
{name: "OpenVPN 2.5", getVersion: ovpnConf.Version25},
{name: "Unbound", getVersion: dnsConf.Version},
{name: "IPtables", getVersion: firewallConf.Version},
}); err != nil {
@@ -165,8 +166,6 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
}
logger.Info(allSettings.String())
allSettings.OpenVPN.Version, _ = ovpnConf.Version(ctx)
if err := os.MkdirAll("/tmp/gluetun", 0644); err != nil {
return err
}