diff options
| author | kali <kali@leap.se> | 2021-12-15 22:53:50 +0100 |
|---|---|---|
| committer | kali kaneko (leap communications) <kali@leap.se> | 2021-12-15 22:54:55 +0100 |
| commit | a114b25c5720cedc93bec36e4fa822fe6cfa85b4 (patch) | |
| tree | 0ac998ca88f6eef0715d0aae35e7476adde7e24a | |
| parent | f336f8f0946c595e6c65c0bb6c7756c19bd30909 (diff) | |
[pkg] fix calyx build for osx
- binary name is different in the osx bundle, theme won't load
- calyx is not ready for tls 1.2 yet
| -rw-r--r-- | gui/main.qml | 4 | ||||
| -rw-r--r-- | pkg/helper/args.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gui/main.qml b/gui/main.qml index f6660df..2d75790 100644 --- a/gui/main.qml +++ b/gui/main.qml @@ -164,9 +164,9 @@ ApplicationWindow { } var providerFlavor = arr[arr.length-1] console.debug("flavor: " + providerFlavor) - if (providerFlavor.startsWith("riseup-vpn")) { + if (providerFlavor.startsWith("riseup-vpn") || providerFlavor == "RiseupVPN") { return "themes/Riseup.qml" - } else if (providerFlavor.startsWith("calyx-vpn")) { + } else if (providerFlavor.startsWith("calyx-vpn") || providerFlavor == "CalyxVPN") { return "themes/Calyx.qml" } else { // we should do a Default theme, with a fallback diff --git a/pkg/helper/args.go b/pkg/helper/args.go index ec4e407..671843c 100644 --- a/pkg/helper/args.go +++ b/pkg/helper/args.go @@ -23,7 +23,7 @@ var ( "--remote-cert-tls", "server", "--dhcp-option", "DNS", nameserverTCP, "--dhcp-option", "DNS", nameserverUDP, - "--tls-version-min", "1.2", + "--tls-version-min", "1.0", "--float", "--log", filepath.Join(LogFolder, "openvpn-leap.log"), } |