From 77d332ba5754b9710963664ee781b713d7b90fb9 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Thu, 24 Aug 2017 16:44:28 -0500 Subject: [PATCH] Sync charm-helpers Change-Id: If1bd2f866d0390f983acb97b7509288ea75f724d --- charmhelpers/contrib/hardening/apache/checks/config.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/charmhelpers/contrib/hardening/apache/checks/config.py b/charmhelpers/contrib/hardening/apache/checks/config.py index b18b263..06482aa 100644 --- a/charmhelpers/contrib/hardening/apache/checks/config.py +++ b/charmhelpers/contrib/hardening/apache/checks/config.py @@ -46,8 +46,9 @@ def get_audits(): context = ApacheConfContext() settings = utils.get_settings('apache') audits = [ - FilePermissionAudit(paths='/etc/apache2/apache2.conf', user='root', - group='root', mode=0o0640), + FilePermissionAudit(paths=os.path.join( + settings['common']['apache_dir'], 'apache2.conf'), + user='root', group='root', mode=0o0640), TemplatedFile(os.path.join(settings['common']['apache_dir'], 'mods-available/alias.conf'),