diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-18 14:27:15 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-18 18:24:20 -0300 |
| commit | 6cd19c3b67d76268bab5f93d3168164ec02f603d (patch) | |
| tree | e86a305064345aab3ea29c356bf281411c331bca /src/leap/bitmask/services/mail/smtpconfig.py | |
| parent | e0734dd4c3c529c99b7c90d8db1dfb9f09551b24 (diff) | |
Move STANDALONE flag to a module and unify paths queries.
Diffstat (limited to 'src/leap/bitmask/services/mail/smtpconfig.py')
| -rw-r--r-- | src/leap/bitmask/services/mail/smtpconfig.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/leap/bitmask/services/mail/smtpconfig.py b/src/leap/bitmask/services/mail/smtpconfig.py index 74c9bc94..09f90314 100644 --- a/src/leap/bitmask/services/mail/smtpconfig.py +++ b/src/leap/bitmask/services/mail/smtpconfig.py @@ -23,6 +23,7 @@ import os from leap.bitmask.config.providerconfig import ProviderConfig from leap.bitmask.services import ServiceConfig from leap.bitmask.services.mail.smtpspec import get_schema +from leap.bitmask.util import get_path_prefix from leap.common.check import leap_assert, leap_assert_type logger = logging.getLogger(__name__) @@ -61,13 +62,10 @@ class SMTPConfig(ServiceConfig): leap_assert(providerconfig, "We need a provider") leap_assert_type(providerconfig, ProviderConfig) - cert_path = os.path.join(self.get_path_prefix(), - "leap", - "providers", + cert_path = os.path.join(get_path_prefix(), + "leap", "providers", providerconfig.get_domain(), - "keys", - "client", - "smtp.pem") + "keys", "client", "smtp.pem") if not about_to_download: leap_assert(os.path.exists(cert_path), |