From 70391f96ae1eeaf7b1eb10cf130c4add6a33fa60 Mon Sep 17 00:00:00 2001 From: Christian Adams Date: Wed, 8 Apr 2020 11:41:57 -0400 Subject: [PATCH] Revert rsyslog valid config to one that fails intentionally --- installer/roles/image_build/files/rsyslog.conf | 3 --- installer/roles/kubernetes/templates/rsyslog.yml.j2 | 4 +--- tools/docker-compose/rsyslog.conf | 3 --- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/installer/roles/image_build/files/rsyslog.conf b/installer/roles/image_build/files/rsyslog.conf index a1fc3407b3..cc67dc4ebd 100644 --- a/installer/roles/image_build/files/rsyslog.conf +++ b/installer/roles/image_build/files/rsyslog.conf @@ -1,4 +1 @@ $WorkDirectory /var/lib/awx/rsyslog -$IncludeConfig /etc/rsyslog.d/*.conf -*.* stop -action(type="omfwd" target="localhost" port="9000" protocol="udp") diff --git a/installer/roles/kubernetes/templates/rsyslog.yml.j2 b/installer/roles/kubernetes/templates/rsyslog.yml.j2 index ba4705f08c..4a3bbea968 100644 --- a/installer/roles/kubernetes/templates/rsyslog.yml.j2 +++ b/installer/roles/kubernetes/templates/rsyslog.yml.j2 @@ -6,6 +6,4 @@ metadata: data: rsyslog-config: | $WorkDirectory /var/lib/awx/rsyslog - $IncludeConfig /etc/rsyslog.d/*.conf - *.* stop - action(type="omfwd" target="localhost" port="9000" protocol="udp") + diff --git a/tools/docker-compose/rsyslog.conf b/tools/docker-compose/rsyslog.conf index a1fc3407b3..cc67dc4ebd 100644 --- a/tools/docker-compose/rsyslog.conf +++ b/tools/docker-compose/rsyslog.conf @@ -1,4 +1 @@ $WorkDirectory /var/lib/awx/rsyslog -$IncludeConfig /etc/rsyslog.d/*.conf -*.* stop -action(type="omfwd" target="localhost" port="9000" protocol="udp")