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

Add default rsyslog.conf without including /etc/rsyslog.conf

Browse Source
This commit is contained in:
Christian Adams
2020-04-01 02:02:04 -04:00
parent d350551547
commit 4d5507d344
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/docker-compose.yml
View File

@@ -9,6 +9,7 @@ services:
hostname: awx
command: launch_awx.sh
environment:
PYTHONUNBUFFERED: 1
CURRENT_UID:
OS:
SDB_HOST: 0.0.0.0

3
tools/docker-compose/Dockerfile
View File

@@ -131,10 +131,9 @@ RUN for dir in /var/lib/awx/rsyslog /var/run/tower/rsyslog /var/log/tower/ /var/
RUN chmod -R 0775 /var/lib/awx /var/lib/awx/rsyslog
RUN chmod -R 0770 /var/lib/rsyslog # needed, or else: rsyslogd: imjournal: open on state file `/var/lib/rsyslog/imjournal.state' failed
ADD tools/docker-compose/rsyslog.repo /etc/yum.repos.d/
RUN yum install -y rsyslog-omhttp
RUN echo '$IncludeConfig /etc/rsyslog.conf' >> /var/lib/awx/rsyslog/rsyslog.conf
RUN echo -e '$WorkDirectory /var/lib/awx/rsyslog\n$IncludeConfig /etc/rsyslog.d/*.conf' >> /var/lib/awx/rsyslog/rsyslog.conf
RUN chmod 0775 /var/lib/awx/rsyslog/rsyslog.conf
ENV HOME /var/lib/awx