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

Merged @kuba changes

Browse source
This commit is contained in:
James Kasten 2014-11-21 23:32:19 -08:00
parent c260232f61
commit 976560b0e9
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
letsencrypt/client/apache_configurator.py
View file

@ -17,9 +17,6 @@ from letsencrypt.client import le_util
from letsencrypt.client import logger
options_ssl_conf = pkg_resources.resource_filename(__name__, os.path.basename(CONFIG.OPTIONS_SSL_CONF))
# Configurator should be turned into a Singleton
# Note: Apache 2.4 NameVirtualHost directive is deprecated... all vhost twins
@ -615,7 +612,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
self.add_dir(vh_p[0], "SSLCertificateFile", "/etc/ssl/certs/ssl-cert-snakeoil.pem")
self.add_dir(vh_p[0], "SSLCertificateKeyFile", "/etc/ssl/private/ssl-cert-snakeoil.key")
self.add_dir(vh_p[0], "Include", options_ssl_conf)
self.add_dir(vh_p[0], "Include", OPTIONS_SSL_CONF)
# Log actions and create save notes
logger.info("Created an SSL vhost at %s" % ssl_fp)
@ -1152,7 +1149,7 @@ SSLStrictSNIVHostCheck on \n \
\n \
LimitRequestBody 1048576 \n \
\n \
Include " + options_ssl_conf + " \n \
Include " + OPTIONS_SSL_CONF + " \n \
SSLCertificateFile " + self.dvsni_get_cert_file(nonce) + " \n \
SSLCertificateKeyFile " + key + " \n \
\n \
@ -1173,6 +1170,13 @@ DocumentRoot " + CONFIG.CONFIG_DIR + "challenge_page/ \n \
result: Apache config includes virtual servers for issued challenges
"""
# Check to make sure options-ssl.conf is installed
if not os.path.isfile(CONFIG.OPTIONS_SSL_CONF):
dist_conf = pkg_resources.resource_filename(
__name__, os.path.basename(CONFIG.OPTIONS_SSL_CONF))
shutil.copyfile(dist_conf, CONFIG.OPTIONS_SSL_CONF)
# TODO: Use ip address of existing vhost instead of relying on FQDN
configText = "<IfModule mod_ssl.c> \n"
for idx, lis in enumerate(listlistAddrs):