diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-12-15 13:11:08 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-12-15 13:11:08 -0300 |
| commit | aff470b3efa671f6c04107f718d359054a739bdc (patch) | |
| tree | efa08835f1ff9c8d01ed93c08b614f056fd6cb4f /src/leap/bitmask/provider/pinned.py | |
| parent | 43a67207845943d5e93c51844feb6666ac1911f5 (diff) | |
| parent | 9e89e4fc8dba7541f3475de0183b47fa9342ea84 (diff) | |
Merge branch 'release/0.7.x' into develop
Conflicts:
pkg/tuf/release.py
relnotes.txt
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 6fd2fa70..09fcc52c 100644 --- a/src/leap/bitmask/provider/pinned.py +++ b/src/leap/bitmask/provider/pinned.py @@ -19,6 +19,7 @@ Pinned Providers """ import logging +from leap.bitmask.provider import pinned_calyx from leap.bitmask.provider import pinned_demobitmask from leap.bitmask.provider import pinned_riseup @@ -35,6 +36,10 @@ class PinnedProviders(object): PREFERRED_PROVIDER = pinned_demobitmask.DOMAIN PROVIDERS = { + pinned_calyx.DOMAIN: { + CONFIG_KEY: pinned_calyx.PROVIDER_JSON, + CACERT_KEY: pinned_calyx.CACERT_PEM, + }, pinned_demobitmask.DOMAIN: { CONFIG_KEY: pinned_demobitmask.PROVIDER_JSON, CACERT_KEY: pinned_demobitmask.CACERT_PEM, |