Change apachectl parameters to work with other distros too

This commit is contained in:
Joona Hoikkala
2015-12-06 22:42:51 +02:00
parent e9c389f125
commit db9bf90cf9
@@ -1083,6 +1083,9 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
:rtype: bool
"""
# Always return true for distros without enabled / available
if self.conf("enmod") == None:
return True
enabled_dir = os.path.join(self.parser.root, "sites-enabled")
for entry in os.listdir(enabled_dir):
try:
@@ -1209,7 +1212,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
"""
try:
le_util.run_script([self.conf("ctl"), "-k", "graceful"])
le_util.run_script([self.conf("ctl"), "graceful"])
except errors.SubprocessError as err:
raise errors.MisconfigurationError(str(err))