upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-06 07:12:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make config singleton acquisition more robust

Browse source 
Fixing failures in testing environments
This commit is contained in:
Peter Eckersley 2015-09-16 15:56:06 -07:00
parent e570dac3c6
commit 0325c6cde6
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
letsencrypt/crypto_util.py
View file

@ -9,14 +9,12 @@ import logging
import os
import OpenSSL
import zope.component
from acme import crypto_util as acme_crypto_util
from acme import jose
from letsencrypt import errors
from letsencrypt import le_util
from letsencrypt import interfaces
@ -48,6 +46,8 @@ def init_save_key(key_size, key_dir, keyname="key-letsencrypt.pem"):
logger.exception(err)
raise err
import zope.component
from letsencrypt import interfaces
config = zope.component.getUtility(interfaces.IConfig)
# Save file
le_util.make_or_verify_dir(key_dir, 0o700, os.geteuid(),
@ -78,7 +78,8 @@ def init_save_csr(privkey, names, path, csrname="csr-letsencrypt.pem"):
"""
csr_pem, csr_der = make_csr(privkey.pem, names)
import zope.component
from letsencrypt import interfaces
config = zope.component.getUtility(interfaces.IConfig)
# Save CSR
le_util.make_or_verify_dir(path, 0o755, os.geteuid(),