From bdf746fa015814edbbc98871fe7cc846bd14801e Mon Sep 17 00:00:00 2001
From: "Alessio Cassibba (x-drum)" <swapon@gmail.com>
Date: Fri, 4 Sep 2015 00:32:22 +0200
Subject: [PATCH] Add sane defaults for additional config stanzas; Minor
 cosmetics

---
 defaults/main.yml       |  1 +
 handlers/main.yml       |  2 +-
 tasks/arch_packages.yml |  2 +-
 tasks/deb_packages.yml  |  2 +-
 tasks/main.yml          | 20 ++++++++++----------
 tasks/rh_packages.yml   |  2 +-
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 9c66e07..2ada778 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -11,5 +11,6 @@ rsyslog_action_file_default_template: RSYSLOG_TraditionalFileFormat
 #rsyslog_action_file_template: "%rawmsg%\n"
 #rsyslog_priv_drop_to_user: syslog
 #rsyslog_priv_drop_to_group: syslog
+items: []
 rsyslog_default_config: "True"
 rsyslog_os_supported: no
\ No newline at end of file
diff --git a/handlers/main.yml b/handlers/main.yml
index 3917efc..67645f7 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
-- name: rsyslog | restart service
+- name: restart rsyslog
   tags: 
     - rsyslog
     - configuration
diff --git a/tasks/arch_packages.yml b/tasks/arch_packages.yml
index 42001ff..c4040d7 100644
--- a/tasks/arch_packages.yml
+++ b/tasks/arch_packages.yml
@@ -1,6 +1,6 @@
 # Install packages for Archlinux
 ---
-- name: Install packages for Archlinux
+- name: install packages for Archlinux
   tags:
     - rsyslog
     - packages
diff --git a/tasks/deb_packages.yml b/tasks/deb_packages.yml
index 1b7b69a..11c475e 100644
--- a/tasks/deb_packages.yml
+++ b/tasks/deb_packages.yml
@@ -1,6 +1,6 @@
 # Install packages for Debian
 ---
-- name: Install packages for Debian
+- name: install packages for Debian
   tags:
     - rsyslog
     - packages
diff --git a/tasks/main.yml b/tasks/main.yml
index a8d2d66..4243872 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,6 +1,6 @@
 # Install and configure rsyslog
 
-- name: rsyslog | Set OS dependent variables
+- name: set OS dependent variables
   tags:
     - rsyslog
     - prereq
@@ -21,7 +21,7 @@
 - include: main_arch.yml
   when: ansible_os_family == 'Archlinux'
 
-- name: rsyslog | Setup main configuration
+- name: setup main configuration
   tags:
     - rsyslog
     - files
@@ -32,10 +32,10 @@
     group={{ rsyslog_file_group }}
     mode={{ rsyslog_file_mode }}
   notify:
-    - rsyslog | restart service
+    - restart rsyslog
   when: rsyslog_os_supported == True
 
-- name: rsyslog | create additional configuration directory
+- name: create additional configuration directory
   tags:
     - rsyslog
     - files
@@ -47,7 +47,7 @@
     state=directory
   when: rsyslog_os_supported == True
 
-- name: rsyslog | Setup default additional configuration
+- name: setup default additional configuration
   tags:
     - rsyslog
     - files
@@ -71,10 +71,10 @@
         - 'local7.*                                 /var/log/boot.log'
         - '*.*                                      /var/log/uncategorized.log'
   notify:
-    - rsyslog | restart service
+    - restart rsyslog
   when: rsyslog_default_config == "True" and rsyslog_os_supported == True
 
-- name: rsyslog | Setup additional configurations
+- name: setup additional configurations
   tags:
     - rsyslog
     - files
@@ -87,13 +87,13 @@
   with_items: 
     - "{{ items }}"
   notify:
-    - rsyslog | restart service
+    - restart rsyslog
   when: rsyslog_os_supported == True
 
-- name: rsyslog | Enable service
+- name: enable service
   tags:
     - rsyslog
     - configuration
-  service: name={{ rsyslog_service_name }} enabled=yes
+  service: name={{ rsyslog_service_name }} enabled=yes state=started
   when: rsyslog_os_supported == True
 
diff --git a/tasks/rh_packages.yml b/tasks/rh_packages.yml
index b3b69e7..e33a900 100644
--- a/tasks/rh_packages.yml
+++ b/tasks/rh_packages.yml
@@ -1,6 +1,6 @@
 # Install packages for RHEL
 ---
-- name: Install packages for RHEL
+- name: install packages for RHEL
   tags:
     - rsyslog
     - packages