From 05d10208a137c1c87d3a0143032fe9029f0ab213 Mon Sep 17 00:00:00 2001 From: Cristian Date: Wed, 28 Sep 2016 14:33:13 +0200 Subject: [PATCH 1/3] fix deprecated variable --- tasks/arch_packages.yml | 2 +- tasks/deb_packages.yml | 2 +- tasks/rh_packages.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/arch_packages.yml b/tasks/arch_packages.yml index c4040d7..73ad829 100644 --- a/tasks/arch_packages.yml +++ b/tasks/arch_packages.yml @@ -5,4 +5,4 @@ - rsyslog - packages pacman: pkg={{item}} state=installed - with_items: rsyslog_package_names + with_items: '{{ rsyslog_package_names }}' diff --git a/tasks/deb_packages.yml b/tasks/deb_packages.yml index 11c475e..146b57b 100644 --- a/tasks/deb_packages.yml +++ b/tasks/deb_packages.yml @@ -5,4 +5,4 @@ - rsyslog - packages apt: pkg={{item}} state=installed - with_items: rsyslog_package_names + with_items: '{{ rsyslog_package_names }}' diff --git a/tasks/rh_packages.yml b/tasks/rh_packages.yml index e33a900..8e28b58 100644 --- a/tasks/rh_packages.yml +++ b/tasks/rh_packages.yml @@ -5,4 +5,4 @@ - rsyslog - packages yum: pkg={{item}} state=installed - with_items: rsyslog_package_names + with_items: '{{ rsyslog_package_names }}' From e3857d610f1eb1cc62cd02a11d88b7844d294499 Mon Sep 17 00:00:00 2001 From: Cristian Date: Wed, 28 Sep 2016 16:00:48 +0200 Subject: [PATCH 2/3] Enable rsyslog server and default port --- README.md | 7 +++++++ defaults/main.yml | 4 +++- templates/rsyslog.conf.j2 | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f4b2aea..be290a3 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,13 @@ Example Playbook - 'if $programname == "dovecot" and $syslogseverity <= "6" then ~' - '& ~' ``` +3) Enable rsyslog server +``` +- hosts: all + + roles: + - { role: ../../roles/ansible-rsyslog-custom, "rsyslog_server": yes } +``` License ------- diff --git a/defaults/main.yml b/defaults/main.yml index 2ada778..872e208 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -13,4 +13,6 @@ rsyslog_action_file_default_template: RSYSLOG_TraditionalFileFormat #rsyslog_priv_drop_to_group: syslog items: [] rsyslog_default_config: "True" -rsyslog_os_supported: no \ No newline at end of file +rsyslog_os_supported: no +#rsyslog_server: no +rsyslog_network_port: "514" diff --git a/templates/rsyslog.conf.j2 b/templates/rsyslog.conf.j2 index 3541b51..721af9d 100644 --- a/templates/rsyslog.conf.j2 +++ b/templates/rsyslog.conf.j2 @@ -25,4 +25,9 @@ $PrivDropToUser {{ rsyslog_priv_drop_to_user }} $PrivDropToGroup {{ rsyslog_priv_drop_to_group }} {% endif %} +{% if rsyslog_server is defined %} +$ModLoad imtcp +$InputTCPServerRun {{ rsyslog_network_port }} +{% endif %} + $IncludeConfig {{ rsyslog_include_path }}/*.conf From a81f022539e426958a4c3e010b49fbcc16c9926b Mon Sep 17 00:00:00 2001 From: Cristian Date: Wed, 28 Sep 2016 16:03:36 +0200 Subject: [PATCH 3/3] Add yaml code in readme.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index be290a3..a22fc86 100644 --- a/README.md +++ b/README.md @@ -67,9 +67,8 @@ Example Playbook - '& ~' ``` 3) Enable rsyslog server -``` +```yaml - hosts: all - roles: - { role: ../../roles/ansible-rsyslog-custom, "rsyslog_server": yes } ```