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

Changed apache reload to more consistent apache restart

Browse source
This commit is contained in:
James Kasten 2012-10-24 18:54:19 -04:00
parent dce90e945c
commit 08ed76da82
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
trustify/client/configurator.py
View file

@ -7,11 +7,11 @@ import socket
import time
import shutil
from trustify.client.CONFIG import SERVER_ROOT, BACKUP_DIR, MODIFIED_FILES
#from CONFIG import SERVER_ROOT, BACKUP_DIR, MODIFIED_FILES, REWRITE_HTTPS_ARGS
from trustify.client.CONFIG import REWRITE_HTTPS_ARGS
from trustify.client import logger
#import logger
#from trustify.client.CONFIG import SERVER_ROOT, BACKUP_DIR, MODIFIED_FILES
from CONFIG import SERVER_ROOT, BACKUP_DIR, MODIFIED_FILES, REWRITE_HTTPS_ARGS
#from trustify.client.CONFIG import REWRITE_HTTPS_ARGS
#from trustify.client import logger
import logger
#TODO - Need an initialization routine... make sure directories exist..ect
@ -706,7 +706,7 @@ LogLevel warn \n\
# Use check_output so the command will finish before reloading
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", "reload"], stdout=open("/dev/null", 'w'), stderr=open("/dev/null", 'w'))
subprocess.check_call(["sudo", "/etc/init.d/apache2", "restart"], stdout=open("/dev/null", 'w'), stderr=open("/dev/null", 'w'))
except:
logger.error("Error enabling mod_" + mod_name)
sys.exit(1)
@ -813,9 +813,9 @@ LogLevel warn \n\
try:
p = ''
if quiet:
p = subprocess.Popen(['/etc/init.d/apache2', 'reload'], stdout=subprocess.PIPE, stderr=open("/dev/null", 'w')).communicate()[0]
p = subprocess.Popen(['/etc/init.d/apache2', 'restart'], stdout=subprocess.PIPE, stderr=open("/dev/null", 'w')).communicate()[0]
else:
p = subprocess.Popen(['/etc/init.d/apache2', 'reload'], stderr=subprocess.PIPE).communicate()[0]
p = subprocess.Popen(['/etc/init.d/apache2', 'restart'], stderr=subprocess.PIPE).communicate()[0]
if "fail" in p:
logger.error("Apache configuration is incorrect")
@ -835,6 +835,10 @@ LogLevel warn \n\
self.aug.insert(lastInclude[0], "incl", False)
self.aug.set("/augeas/load/Httpd/incl[last()]", incl)
def configtest(self):
p = subprocess.Popen(['sudo', '/usr/sbin/apache2ctl', 'configtest'], stdout=subprocess.PIPE, stderr=open("/dev/null", 'w')).communicate()[0]
print p
def save(self, mod_conf="Augeas Configuration", reversible=False):
"""
Saves all changes to the configuration files
@ -867,8 +871,8 @@ LogLevel warn \n\
return False
# Retrieve list of modified files
# Note: Noop saves can cause the file to be listed twice, used set to
# remove this possibility
# Note: Noop saves can cause the file to be listed twice, I used a
# set to remove this possibility. This is a known augeas error.
save_paths = self.aug.match("/augeas/events/saved")
# If the augeas tree didn't change, no files were saved and a backup
@ -1030,6 +1034,7 @@ def main():
#config.recover_checkpoint(1)
"""
config.display_checkpoints()
config.configtest()
"""
#config.make_vhost_ssl("/etc/apache2/sites-available/default")
# Testing redirection