mirror of
https://github.com/certbot/certbot.git
synced 2026-07-28 00:35:50 +02:00
Forgot to make options-ssl.conf part of the required setup... added code to check and copy it down to the appropriate place to aid developers working on the project, this will eventually go in the setup files
This commit is contained in:
@@ -935,8 +935,9 @@ LogLevel warn \n\
|
||||
subprocess.check_call(["sudo", "a2enmod", mod_name], stdout=open("/dev/null", 'w'), stderr=open("/dev/null", 'w'))
|
||||
# Hopefully this waits for output
|
||||
subprocess.check_call(["sudo", "/etc/init.d/apache2", "restart"], stdout=open("/dev/null", 'w'), stderr=open("/dev/null", 'w'))
|
||||
except:
|
||||
except Exception as e:
|
||||
logger.error("Error enabling mod_" + mod_name)
|
||||
logger.error("Exception: %s" % str(e))
|
||||
sys.exit(1)
|
||||
|
||||
def fnmatch_to_re(self, cleanFNmatch):
|
||||
@@ -1177,6 +1178,10 @@ DocumentRoot " + 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(OPTIONS_SSL_CONF):
|
||||
shutil.copyfile("letsencrypt/client/%s" % os.path.basename(OPTIONS_SSL_CONF), 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):
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
#!/usr/bin/sh
|
||||
cp ca_offerings /etc/trustify/.ca_offerings
|
||||
cp options-ssl.conf /etc/trustify/options-ssl.conf
|
||||
cp options-ssl.conf /etc/letsencrypt/options-ssl.conf
|
||||
|
||||
Reference in New Issue
Block a user