summaryrefslogtreecommitdiffstats
path: root/roles/base
diff options
context:
space:
mode:
authorKevin Fenzi <kevin@scrye.com>2014-02-28 23:21:00 +0000
committerKevin Fenzi <kevin@scrye.com>2014-02-28 23:21:00 +0000
commitcfdba2b43bcb01e4a93d5aacf98bcc314fb97ed2 (patch)
treea7003e449a994d5fb89e340903720133f3d3d548 /roles/base
parent7d904a36934d43f8a456097d77e66c77ab8ff5c6 (diff)
Work around local4 syslog issue with mirrorlists for now.
Diffstat (limited to 'roles/base')
-rw-r--r--roles/base/files/rsyslog/rsyslog-log02 (renamed from roles/base/files/rsyslog/rsyslog-log02.conf)0
-rw-r--r--roles/base/files/rsyslog/rsyslog-log02-nolocal44
-rw-r--r--roles/base/tasks/main.yml14
3 files changed, 18 insertions, 0 deletions
diff --git a/roles/base/files/rsyslog/rsyslog-log02.conf b/roles/base/files/rsyslog/rsyslog-log02
index f9b17ef71..f9b17ef71 100644
--- a/roles/base/files/rsyslog/rsyslog-log02.conf
+++ b/roles/base/files/rsyslog/rsyslog-log02
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/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: