External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-24 14:36:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4384 from ryanpetrello/rsyslog-chmod

Browse Source 
properly write rsyslog configuration as 0640
This commit is contained in:
Ryan Petrello
2020-06-08 14:05:18 -04:00
committed by GitHub
parent 0a0735344e c53e5bdbcf
commit 99c0a954e4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/utils/external_logging.py
View File

@@ -1,6 +1,6 @@
import os import os
import shutil import shutil
import tempfile import tempfile
import urllib.parse as urlparse import urllib.parse as urlparse
from django.conf import settings from django.conf import settings
@@ -117,6 +117,7 @@ def reconfigure_rsyslog():
with tempfile.TemporaryDirectory(prefix='rsyslog-conf-') as temp_dir: with tempfile.TemporaryDirectory(prefix='rsyslog-conf-') as temp_dir:
path = temp_dir + '/rsyslog.conf.temp' path = temp_dir + '/rsyslog.conf.temp'
with open(path, 'w') as f: with open(path, 'w') as f:
os.chmod(path, 0o640)
f.write(tmpl + '\n') f.write(tmpl + '\n')
shutil.move(path, '/var/lib/awx/rsyslog/rsyslog.conf') shutil.move(path, '/var/lib/awx/rsyslog/rsyslog.conf')
supervisor_service_command(command='restart', service='awx-rsyslogd') supervisor_service_command(command='restart', service='awx-rsyslogd')