diff options
| author | kali <kali@leap.se> | 2012-10-24 04:05:19 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-10-24 04:05:19 +0900 |
| commit | 0060d3c74adce19fab7215b3788c5197cc05a9ae (patch) | |
| tree | 30de33e139ebcd5126f553409df4b2efac9df374 /src/leap/eip/specs.py | |
| parent | ac67079632fb96d9da463e0cc9f2367b0ba6886e (diff) | |
sign up branch ends by triggering eip connection
still need to bind signals properly, and block on the validation
process until we receive the "connected" signal. but the basic flow
is working again, i.e, user should be able to remove the .config/leap
folder and get all the needed info from the provider.
Diffstat (limited to 'src/leap/eip/specs.py')
| -rw-r--r-- | src/leap/eip/specs.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/leap/eip/specs.py b/src/leap/eip/specs.py index 4014b7c9..84b2597d 100644 --- a/src/leap/eip/specs.py +++ b/src/leap/eip/specs.py @@ -4,6 +4,8 @@ import os from leap import __branding from leap.base import config as baseconfig +# XXX move provider stuff to base config + PROVIDER_CA_CERT = __branding.get( 'provider_ca_file', 'testprovider-ca-cert.pem') @@ -13,7 +15,7 @@ provider_ca_path = lambda domain: str(os.path.join( baseconfig.get_provider_path(domain), 'keys', 'ca', 'cacert.pem' -)) +)) if domain else None default_provider_ca_path = lambda: str(os.path.join( baseconfig.get_default_provider_path(), @@ -28,7 +30,7 @@ client_cert_path = lambda domain: unicode(os.path.join( baseconfig.get_provider_path(domain), 'keys', 'client', 'openvpn.pem' -)) +)) if domain else None default_client_cert_path = lambda: unicode(os.path.join( baseconfig.get_default_provider_path(), |