starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-01 10:51:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite certificate install logic

Browse Source 
Tests are being written
This commit is contained in:
Liam Marshall
2015-11-14 11:43:54 -06:00
parent 9bf1b99b5b
commit 361b67276e
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt-apache/letsencrypt_apache/configurator.py
+17 -15
View File
@@ -210,25 +210,27 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
"Unable to find cert and/or key directives") "Unable to find cert and/or key directives")
logger.info("Deploying Certificate to VirtualHost %s", vhost.filep) logger.info("Deploying Certificate to VirtualHost %s", vhost.filep)
logger.debug("Apache version is %s",
".".join(str(i) for i in self.version))
# Assign the final directives; order is maintained in find_dir if self.version < (2, 4, 8) or (chain_path and not fullchain_path):
if self.version >= (2, 4, 8) and fullchain_path is not None: # install SSLCertificateFile, SSLCertificateKeyFile, and SSLCertificateChainFile directives
logger.debug("Apache version (%s) is >= 2.4.8",
".".join(str(i) for i in self.version))
set_cert_path = fullchain_path
self.aug.set(path["cert_path"][-1], fullchain_path)
self.aug.set(path["cert_key"][-1], key_path)
else: # fall back to old SSL cert method
logger.debug("Apache version (%s) is < 2.4.8",
".".join(str(i) for i in self.version))
set_cert_path = cert_path set_cert_path = cert_path
self.aug.set(path["cert_path"][-1], cert_path) self.aug.set(path["cert_path"][-1], cert_path)
self.aug.set(path["cert_key"][-1], key_path) self.aug.set(path["cert_key"][-1], key_path)
if not path["chain_path"]: if chain_path is not None:
self.parser.add_dir(vhost.path, if not path["chain_path"]:
"SSLCertificateChainFile", chain_path) self.parser.add_dir(vhost.path,
else: "SSLCertificateChainFile", chain_path)
self.aug.set(path["chain_path"][-1], chain_path) else:
self.aug.set(path["chain_path"][-1], chain_path)
else:
if not fullchain_path:
raise errors.PluginError("Please provide the --fullchain-path\
option pointing to your full chain file")
set_cert_path = fullchain_path
self.aug.set(path["cert_path"][-1], fullchain_path)
self.aug.set(path["cert_key"][-1], key_path)
# Save notes about the transaction that took place # Save notes about the transaction that took place
self.save_notes += ("Changed vhost at %s with addresses of %s\n" self.save_notes += ("Changed vhost at %s with addresses of %s\n"