diff options
| author | Kali Kaneko (leap communications) <kali@leap.se> | 2017-01-31 13:31:13 +0100 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2017-02-23 00:37:25 +0100 |
| commit | ca0e1c4518749e27bccad817d22ab87afbf8acf7 (patch) | |
| tree | 636c1188683c1ea91d70b3aecd2810aafa7cf724 /src/leap/bitmask/core | |
| parent | ff5ec25029db7669163854886be254fccde90e80 (diff) | |
[feature] initial port of legacy vpn code
non functional at the moment, but started doing some cleanup
Diffstat (limited to 'src/leap/bitmask/core')
| -rw-r--r-- | src/leap/bitmask/core/configurable.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/core/service.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/bitmask/core/configurable.py b/src/leap/bitmask/core/configurable.py index 51a100d6..692ec066 100644 --- a/src/leap/bitmask/core/configurable.py +++ b/src/leap/bitmask/core/configurable.py @@ -46,7 +46,7 @@ class ConfigurableService(service.MultiService): DEFAULT_CONFIG = """ [services] mail = True -eip = True +eip = False zmq = True web = True onion = False diff --git a/src/leap/bitmask/core/service.py b/src/leap/bitmask/core/service.py index c3e97f72..a34bf0e9 100644 --- a/src/leap/bitmask/core/service.py +++ b/src/leap/bitmask/core/service.py @@ -32,8 +32,8 @@ from leap.bitmask.core import _zmq from leap.bitmask.core import flags from leap.bitmask.core import _session from leap.bitmask.core.web.service import HTTPDispatcherService +from leap.bitmask.vpn import EIPService from leap.common.events import server as event_server -# from leap.vpn import EIPService logger = Logger() |