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

Merge pull request #4387 from dhuang/shh-apache-version

Browse Source 
Do not output apache version when deploying cert
This commit is contained in:
Noah Swartz
2017-03-21 16:39:31 -07:00
committed by GitHub
parent bf45cea7cd 1e36783986
commit 09377437dc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
certbot-apache/certbot_apache/configurator.py
+3 -3
View File
@@ -174,6 +174,8 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
# Set Version # Set Version
if self.version is None: if self.version is None:
self.version = self.get_version() self.version = self.get_version()
logger.debug('Apache version is %s',
'.'.join(str(i) for i in self.version))
if self.version < (2, 2): if self.version < (2, 2):
raise errors.NotSupportedError( raise errors.NotSupportedError(
"Apache Version %s not supported.", str(self.version)) "Apache Version %s not supported.", str(self.version))
@@ -254,9 +256,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
raise errors.PluginError( raise errors.PluginError(
"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 for %s to VirtualHost %s", domain, vhost.filep)
logger.debug("Apache version is %s",
".".join(str(i) for i in self.version))
if self.version < (2, 4, 8) or (chain_path and not fullchain_path): if self.version < (2, 4, 8) or (chain_path and not fullchain_path):
# install SSLCertificateFile, SSLCertificateKeyFile, # install SSLCertificateFile, SSLCertificateKeyFile,