Skip to content

enabling the use of a generic challenge dir #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
taziden wants to merge 1 commit into
base: master
Choose a base branch
from
Open

enabling the use of a generic challenge dir #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 35 additions & 19 deletions lecm/certificate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@ def __init__(self, conf):
'account_%s.key' % socket.getfqdn())
self.remaining_days = conf.get('remaining_days', 10)
self.days_before_expiry = self.get_days_before_expiry()
self.service_name = conf.get('service_name', 'httpd')
self.service_provider = conf.get('service_provider', 'systemd')
self.service_name = conf.get("service_name", "httpd")
self.service_provider = conf.get("service_provider", "systemd")
self.use_generic_challenge_dir = conf.get("use_generic_challenge_dir", False)

self.subject = {
'C': conf.get('countryName'),
Expand Down Expand Up @@ -226,23 +227,38 @@ def _create_csr(self):
csr_file.close()

def _create_certificate(self):
LOG.info('[%s] Retrieving certificate from Let''s Encrypt Server' %
self.name)
command = 'acme-tiny --account-key %s/private/%s --csr %s/csr/%s.csr \
--acme-dir %s/challenges/%s' % (self.path,
self.account_key_name,
self.path, self.name,
self.path, self.name)

if self.environment == 'staging':
LOG.info('[%s] Using Let''s Encrypt staging API: %s' %
(self.name, _STAGING_URL))
command = '%s --ca %s' % (command, _STAGING_URL)

cert_file_f = open('%s/certs/%s.crt.new' % (self.path, self.name), 'w')

p = subprocess.Popen(command.split(), stdout=cert_file_f,
stderr=subprocess.PIPE)
LOG.info("[%s] Retrieving certificate from Let" "s Encrypt Server" % self.name)
if self.use_generic_challenge_dir:
command = (
"acme-tiny --account-key %s/private/%s --csr %s/csr/%s.csr \
--acme-dir %s/challenges/"
% (self.path, self.account_key_name, self.path, self.name, self.path)
)
else:
command = (
"acme-tiny --account-key %s/private/%s --csr %s/csr/%s.csr \
--acme-dir %s/challenges/%s"
% (
self.path,
self.account_key_name,
self.path,
self.name,
self.path,
self.name,
)
)

if self.environment == "staging":
LOG.info(
"[%s] Using Let" "s Encrypt staging API: %s" % (self.name, _STAGING_URL)
)
command = "%s --ca %s" % (command, _STAGING_URL)

cert_file_f = open("%s/certs/%s.crt.new" % (self.path, self.name), "w")

p = subprocess.Popen(
command.split(), stdout=cert_file_f, stderr=subprocess.PIPE
)
out, err = p.communicate()

if p.returncode != 0:
Expand Down
26 changes: 21 additions & 5 deletions lecm/configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,27 @@

LOG = logging.getLogger(__name__)

_FIELDS = ['type', 'size', 'digest', 'version', 'subjectAltName',
'countryName', 'stateOrProvinceName', 'localityName',
'organizationName', 'organizationUnitName', 'commonName',
'emailAddress', 'account_key_name', 'path', 'remaining_days',
'service_name', 'service_provider', 'environment']
_FIELDS = [
"type",
"size",
"digest",
"version",
"subjectAltName",
"countryName",
"stateOrProvinceName",
"localityName",
"organizationName",
"organizationUnitName",
"commonName",
"emailAddress",
"account_key_name",
"path",
"remaining_days",
"service_name",
"service_provider",
"environment",
"use_generic_challenge_dir",
]


def check_configuration_file_existence(configuration_file_path=None):
Expand Down