diff options
| author | kali <kali@leap.se> | 2012-09-20 02:40:56 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-09-20 02:40:56 +0900 |
| commit | 50396fca082652dd1a1617e0d029c1c726e4c651 (patch) | |
| tree | ee7a91c49034c95493957550c94164c06ecbea30 /src/leap/eip/specs.py | |
| parent | cfb7f5a2e9bae74dd60067a399a222d62e81da2c (diff) | |
| parent | ecd8696e6e009826523b62a508cdf2202eaa2411 (diff) | |
Merge branch 'feature/branding' into develop
Closes #553
Diffstat (limited to 'src/leap/eip/specs.py')
| -rw-r--r-- | src/leap/eip/specs.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/leap/eip/specs.py b/src/leap/eip/specs.py index e617574c..05aef590 100644 --- a/src/leap/eip/specs.py +++ b/src/leap/eip/specs.py @@ -1,15 +1,21 @@ from __future__ import (unicode_literals) import os +from leap import __branding from leap.base import config as baseconfig +PROVIDER_CA_CERT = __branding.get( + 'provider_ca_file', + 'testprovider-ca-cert.pem') provider_ca_path = lambda: unicode(os.path.join( baseconfig.get_default_provider_path(), 'keys', 'ca', - 'testprovider-ca-cert.pem' + PROVIDER_CA_CERT )) +PROVIDER_DOMAIN = __branding.get('provider_domain', 'testprovider.example.org') + client_cert_path = lambda: unicode(os.path.join( baseconfig.get_default_provider_path(), @@ -20,7 +26,7 @@ client_cert_path = lambda: unicode(os.path.join( eipconfig_spec = { 'provider': { 'type': unicode, - 'default': u"testprovider.example.org", + 'default': u"%s" % PROVIDER_DOMAIN, 'required': True, }, 'transport': { |