diff options
author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-18 12:34:31 -0300 |
---|---|---|
committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-18 12:34:31 -0300 |
commit | 9f0968da51cc9a16577c563887ae336066ddc0eb (patch) | |
tree | 7f0e744a12e0b67fab2818216a353b54bc8ba730 /src/leap/bitmask/services/eip/eipconfig.py | |
parent | 735111cee1c28ccc07c87d806bc5412aaffcedf7 (diff) | |
parent | 13f5d8fcee038f441dd91ef16dfdb254e1f0dd3f (diff) |
Merge remote-tracking branch 'kali/bug/start_smtp_without_eip' into develop
Diffstat (limited to 'src/leap/bitmask/services/eip/eipconfig.py')
-rw-r--r-- | src/leap/bitmask/services/eip/eipconfig.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/leap/bitmask/services/eip/eipconfig.py b/src/leap/bitmask/services/eip/eipconfig.py index 1cb7419e..2241290b 100644 --- a/src/leap/bitmask/services/eip/eipconfig.py +++ b/src/leap/bitmask/services/eip/eipconfig.py @@ -26,9 +26,9 @@ import time import ipaddr from leap.bitmask.config.providerconfig import ProviderConfig +from leap.bitmask.services import ServiceConfig from leap.bitmask.services.eip.eipspec import get_schema from leap.common.check import leap_assert, leap_assert_type -from leap.common.config.baseconfig import BaseConfig logger = logging.getLogger(__name__) @@ -144,15 +144,17 @@ class VPNGatewaySelector(object): return -local_offset / 3600 -class EIPConfig(BaseConfig): +class EIPConfig(ServiceConfig): """ Provider configuration abstraction class """ + _service_name = "eip" + OPENVPN_ALLOWED_KEYS = ("auth", "cipher", "tls-cipher") OPENVPN_CIPHERS_REGEX = re.compile("[A-Z0-9\-]+") def __init__(self): - BaseConfig.__init__(self) + ServiceConfig.__init__(self) self._api_version = None def _get_schema(self): |