summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2018-03-01 13:30:17 +0100
committerKali Kaneko <kali@leap.se>2018-03-02 03:54:18 +0100
commitba2a5cefe99eba802476a57fe282226af5a53a09 (patch)
tree21030316c0b9b9af73a063dc4be8482e6a318c82 /src/leap
parentb3549ae8cd496bbb16b7aa67e35717b60378dbf7 (diff)
[pkg] add snap openvpn to bitmask-root
Diffstat (limited to 'src/leap')
-rwxr-xr-xsrc/leap/bitmask/vpn/helpers/linux/bitmask-root9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/leap/bitmask/vpn/helpers/linux/bitmask-root b/src/leap/bitmask/vpn/helpers/linux/bitmask-root
index 6b9870e7..3f6c1e74 100755
--- a/src/leap/bitmask/vpn/helpers/linux/bitmask-root
+++ b/src/leap/bitmask/vpn/helpers/linux/bitmask-root
@@ -82,7 +82,7 @@ def get_no_group_name():
return None
-VERSION = "8"
+VERSION = "9"
SCRIPT = "bitmask-root"
NAMESERVER_TCP = "10.41.0.1"
NAMESERVER_UDP = "10.42.0.1"
@@ -106,6 +106,7 @@ OPENVPN_GROUP = get_no_group_name()
LEAPOPENVPN = "LEAPOPENVPN"
OPENVPN_SYSTEM_BIN = "/usr/sbin/openvpn" # Debian location
OPENVPN_LEAP_BIN = "/usr/local/sbin/leap-openvpn" # installed by bundle
+OPENVPN_SNAP_BIN = "/snap/bin/riseup-vpn.openvpn" # installed by snap
FIXED_FLAGS = [
"--setenv", "LEAPOPENVPN", "1",
@@ -359,7 +360,11 @@ def get_openvpn_bin():
if os.path.isfile(OPENVPN_SYSTEM_BIN):
return OPENVPN_SYSTEM_BIN
- # the bundle option should be removed from the debian package.
+ # the snap option should be removed from the debian package.
+ if os.path.isfile(OPENVPN_SNAP_BIN):
+ return OPENVPN_SNAP_BIN
+
+ # the bundle option should also be removed from the debian.
if os.path.isfile(OPENVPN_LEAP_BIN):
return OPENVPN_LEAP_BIN