From cfdba2b43bcb01e4a93d5aacf98bcc314fb97ed2 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 28 Feb 2014 23:21:00 +0000 Subject: Work around local4 syslog issue with mirrorlists for now. --- roles/base/files/rsyslog/rsyslog-log02 | 4 ++++ roles/base/files/rsyslog/rsyslog-log02-nolocal4 | 4 ++++ roles/base/files/rsyslog/rsyslog-log02.conf | 4 ---- roles/base/tasks/main.yml | 14 ++++++++++++++ 4 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 roles/base/files/rsyslog/rsyslog-log02 create mode 100644 roles/base/files/rsyslog/rsyslog-log02-nolocal4 delete mode 100644 roles/base/files/rsyslog/rsyslog-log02.conf diff --git a/roles/base/files/rsyslog/rsyslog-log02 b/roles/base/files/rsyslog/rsyslog-log02 new file mode 100644 index 000000000..f9b17ef71 --- /dev/null +++ b/roles/base/files/rsyslog/rsyslog-log02 @@ -0,0 +1,4 @@ +# +# Send everything on to central log02 logger machines +# +cron.*;kern.*;authpriv.*;local7.*;*.info;local6.none;local4.* @@log02:514 diff --git a/roles/base/files/rsyslog/rsyslog-log02-nolocal4 b/roles/base/files/rsyslog/rsyslog-log02-nolocal4 new file mode 100644 index 000000000..8338bfed7 --- /dev/null +++ b/roles/base/files/rsyslog/rsyslog-log02-nolocal4 @@ -0,0 +1,4 @@ +# +# Send everything on to central log02 logger machines +# +cron.*;kern.*;authpriv.*;local7.*;*.info;local6.none @@log02:514 diff --git a/roles/base/files/rsyslog/rsyslog-log02.conf b/roles/base/files/rsyslog/rsyslog-log02.conf deleted file mode 100644 index f9b17ef71..000000000 --- a/roles/base/files/rsyslog/rsyslog-log02.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -# Send everything on to central log02 logger machines -# -cron.*;kern.*;authpriv.*;local7.*;*.info;local6.none;local4.* @@log02:514 diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index b46dca12b..24de46313 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -125,6 +125,20 @@ - rsyslogd - config +- name: log everything to log02 except on mirrorlist, do not log local4 there. + copy: src=rsyslog/rsyslog-log02 dest=/etc/rsyslog.d/rsyslog-log02.conf mode=644 + when: not inventory_hostname.startswith('mirrorlist') + tags: + - rsyslogd + - config + +- name: log everything to log02 except on mirrorlist, do not log local4 there. + copy: src=rsyslog/rsyslog-log02-nolocal4 dest=/etc/rsyslog.d/rsyslog-log02.conf mode=644 + when: inventory_hostname.startswith('mirrorlist') + tags: + - rsyslogd + - config + - name: /etc/postfix/main.cf copy: src={{ item }} dest=/etc/postfix/main.cf first_available_file: -- cgit