From 9c0addf17c04b4fba5261733d1d4ba85e940c31c Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sat, 25 Jan 2014 17:57:18 +0000
Subject: [PATCH] More cleanup, use fileglob

---
 .../rsyslog/{rsyslog.conf => rsyslog.conf.default}     |  0
 roles/base/tasks/main.yml                              | 10 ++++------
 2 files changed, 4 insertions(+), 6 deletions(-)
 rename roles/base/files/rsyslog/{rsyslog.conf => rsyslog.conf.default} (100%)

diff --git a/roles/base/files/rsyslog/rsyslog.conf b/roles/base/files/rsyslog/rsyslog.conf.default
similarity index 100%
rename from roles/base/files/rsyslog/rsyslog.conf
rename to roles/base/files/rsyslog/rsyslog.conf.default
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index de20946ed2..2f934b61e3 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -107,7 +107,7 @@
   copy: src={{ item }} dest=/etc/rsyslog.conf mode=644
   first_available_file:
     - rsyslog/rsyslog.conf.{{ dist_tag }}
-    - rsyslog/rsyslog.conf
+    - rsyslog/rsyslog.conf.default
 
   notify:
   - restart rsyslog
@@ -116,11 +116,9 @@
   - config
 
 - name: add rsyslog config to /etc/rsyslog.d
-  copy: src={{ item }} dest=/etc/rsyslog.d/{{ item }} mode=644
-  with_items:
-   - rsyslog/rsyslog-audit.conf
-   - rsyslog/rsyslog-disablerate.conf
-   - rsyslog/rsyslog-log02.conf
+  copy: src={{ item }} dest=/etc/rsyslog.d/ owner=root group=root mode=0644
+  with_fileglob:
+   - rsyslog/*.conf
   tags:
   - rsyslogd
   - config