Maint: re-order OpenVPN options

This commit is contained in:
Quentin McGaw (desktop)
2021-09-14 15:46:40 +00:00
parent c3078f84e8
commit 1340511b64
17 changed files with 105 additions and 108 deletions

View File

@@ -21,15 +21,18 @@ func (v *Vyprvpn) BuildConf(connection models.Connection,
lines = []string{
"client",
"dev " + settings.Interface,
"nobind",
"remote-cert-tls server",
"tls-exit",
"dev " + settings.Interface,
"verb " + strconv.Itoa(settings.Verbosity),
// Vyprvpn specific
"ping 10",
"remote-cert-tls server",
// "verify-x509-name lu1.vyprvpn.com name",
"tls-cipher TLS-ECDHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-RSA-WITH-AES-256-CBC-SHA256:TLS-DHE-RSA-WITH-AES-256-CBC-SHA", //nolint:lll
"auth-user-pass " + constants.OpenVPNAuthConf,
"auth " + settings.Auth,
// Added constant values
"auth-nocache",
@@ -38,12 +41,9 @@ func (v *Vyprvpn) BuildConf(connection models.Connection,
"auth-retry nointeract",
"suppress-timestamps",
// Modified variables
"verb " + strconv.Itoa(settings.Verbosity),
"auth-user-pass " + constants.OpenVPNAuthConf,
// Connection variables
connection.OpenVPNProtoLine(),
connection.OpenVPNRemoteLine(),
"auth " + settings.Auth,
}
lines = append(lines, utils.CipherLines(settings.Cipher, settings.Version)...)