diff options
author | Kali Kaneko <kali@leap.se> | 2014-06-19 13:34:50 -0500 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2014-06-19 13:34:50 -0500 |
commit | bfcd118cc0cab27057419ace691bb0caa7f2f430 (patch) | |
tree | 0ae062948d8e20cdf2645a64d79aa3e548c3511f /src/leap/bitmask/provider/pinned.py | |
parent | b4c26d2b6bf0d84e723d5e7b36042c67a75f268b (diff) | |
parent | 3406150b9e3e6bfce198f3b3a9716c510f3c7022 (diff) |
Merge remote-tracking branch 'chiiph/feature/pin_riseup' into develop
Diffstat (limited to 'src/leap/bitmask/provider/pinned.py')
-rw-r--r-- | src/leap/bitmask/provider/pinned.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/leap/bitmask/provider/pinned.py b/src/leap/bitmask/provider/pinned.py index d9b74c3d..38851621 100644 --- a/src/leap/bitmask/provider/pinned.py +++ b/src/leap/bitmask/provider/pinned.py @@ -20,6 +20,7 @@ Pinned Providers import logging from leap.bitmask.provider import pinned_demobitmask +from leap.bitmask.provider import pinned_riseup logger = logging.getLogger(__name__) @@ -36,6 +37,10 @@ class PinnedProviders(object): pinned_demobitmask.DOMAIN: { CONFIG_KEY: pinned_demobitmask.PROVIDER_JSON, CACERT_KEY: pinned_demobitmask.CACERT_PEM, + }, + pinned_riseup.DOMAIN: { + CONFIG_KEY: pinned_riseup.PROVIDER_JSON, + CACERT_KEY: pinned_riseup.CACERT_PEM, } } |