From 03aa9734f5574045cfbb13c06e0bc626f0bf48db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 13 Dec 2018 11:21:02 +0100 Subject: [PATCH] do not deploy rsyslog-audit.conf in cloud environment addressing: https://pagure.io/fedora-infrastructure/issue/7438 --- roles/base/files/rsyslog/rsyslog-audit.conf.cloud | 1 + ...syslog-audit.conf => rsyslog-audit.conf.default} | 0 roles/base/tasks/main.yml | 13 +++++++++++++ 3 files changed, 14 insertions(+) create mode 100644 roles/base/files/rsyslog/rsyslog-audit.conf.cloud rename roles/base/files/rsyslog/{rsyslog-audit.conf => rsyslog-audit.conf.default} (100%) diff --git a/roles/base/files/rsyslog/rsyslog-audit.conf.cloud b/roles/base/files/rsyslog/rsyslog-audit.conf.cloud new file mode 100644 index 0000000000..1b99256360 --- /dev/null +++ b/roles/base/files/rsyslog/rsyslog-audit.conf.cloud @@ -0,0 +1 @@ +# we do not offer log servers in the cloud diff --git a/roles/base/files/rsyslog/rsyslog-audit.conf b/roles/base/files/rsyslog/rsyslog-audit.conf.default similarity index 100% rename from roles/base/files/rsyslog/rsyslog-audit.conf rename to roles/base/files/rsyslog/rsyslog-audit.conf.default diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index aad1619405..372bed7f28 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -276,6 +276,19 @@ - config - base +- name: rsyslog-audit.conf + copy: src={{ item }} dest=/etc/rsyslog.d/rsyslog-audit.conf owner=root group=root mode=0644 + with_first_found: + - rsyslog/rsyslog-audit.conf.{{ datacenter }} + - rsyslog/rsyslog-audit.conf.default + notify: + - restart rsyslog + tags: + - rsyslogd + - config + - base + +- name: remove - name: log everything to log01 except on mirrorlist, do not log local4 there. copy: src=rsyslog/rsyslog-log01 dest=/etc/rsyslog.d/rsyslog-log01.conf mode=0644 when: not inventory_hostname.startswith(('mirrorlist','copr'))