Added /var/log/supervisor to paths hidden by proot.

This commit is contained in:
Chris Church
2014-11-04 11:27:20 -05:00
parent dc3dd0db26
commit 886d9f2120
2 changed files with 20 additions and 2 deletions

View File

@@ -338,12 +338,13 @@ class BaseTask(Task):
- /etc/tower (to prevent obtaining db info or secret key)
- /var/lib/awx (except for current project)
- /var/log/tower
- /var/log/supervisor
- /tmp (except for own tmp files)
'''
new_args = [getattr(settings, 'AWX_PROOT_CMD', 'proot'), '-r', '/']
hide_paths = ['/etc/tower', '/var/lib/awx', '/var/log/tower',
tempfile.gettempdir(), settings.PROJECTS_ROOT,
settings.JOBOUTPUT_ROOT]
'/var/log/supervisor', tempfile.gettempdir(),
settings.PROJECTS_ROOT, settings.JOBOUTPUT_ROOT]
hide_paths.extend(getattr(settings, 'AWX_PROOT_HIDE_PATHS', None) or [])
for path in sorted(set(hide_paths)):
if not os.path.exists(path):