From 4284dd63aae28207bcb89aaf8a46bc0a11f83901 Mon Sep 17 00:00:00 2001 From: Evgeniy Ivanov Date: Sun, 28 Aug 2016 22:06:33 +0300 Subject: [PATCH] rsyslog moved to the logging role --- roles/logging/handlers/main.yml | 3 +++ roles/logging/tasks/main.yml | 17 +++++++++++++++++ .../{security => logging}/templates/CIS.conf.j2 | 0 .../templates/rsyslog.conf.j2 | 0 roles/security/handlers/main.yml | 3 --- roles/security/tasks/main.yml | 15 --------------- 6 files changed, 20 insertions(+), 18 deletions(-) rename roles/{security => logging}/templates/CIS.conf.j2 (100%) rename roles/{security => logging}/templates/rsyslog.conf.j2 (100%) diff --git a/roles/logging/handlers/main.yml b/roles/logging/handlers/main.yml index 651d8a7..9dcd122 100644 --- a/roles/logging/handlers/main.yml +++ b/roles/logging/handlers/main.yml @@ -1,2 +1,5 @@ +- name: restart rsyslog + service: name=rsyslog state=restarted + - name: restart auditd service: name=auditd state=restarted diff --git a/roles/logging/tasks/main.yml b/roles/logging/tasks/main.yml index fdda937..48ed479 100644 --- a/roles/logging/tasks/main.yml +++ b/roles/logging/tasks/main.yml @@ -1,3 +1,5 @@ +# Auditd + - name: Auditd installed apt: name=auditd state=latest @@ -13,3 +15,18 @@ - name: Enable services service: name=auditd enabled=yes + +# Rsyslog + +- name: Rsyslog configured + template: src=rsyslog.conf.j2 dest=/etc/rsyslog.conf + notify: + - restart rsyslog + +- name: Rsyslog CIS configured + template: src=CIS.conf.j2 dest=/etc/rsyslog.d/CIS.conf owner=root group=root mode=0644 + notify: + - restart rsyslog + +- name: Enable services + service: name=rsyslog enabled=yes diff --git a/roles/security/templates/CIS.conf.j2 b/roles/logging/templates/CIS.conf.j2 similarity index 100% rename from roles/security/templates/CIS.conf.j2 rename to roles/logging/templates/CIS.conf.j2 diff --git a/roles/security/templates/rsyslog.conf.j2 b/roles/logging/templates/rsyslog.conf.j2 similarity index 100% rename from roles/security/templates/rsyslog.conf.j2 rename to roles/logging/templates/rsyslog.conf.j2 diff --git a/roles/security/handlers/main.yml b/roles/security/handlers/main.yml index efb7ca4..e79c49c 100644 --- a/roles/security/handlers/main.yml +++ b/roles/security/handlers/main.yml @@ -1,6 +1,3 @@ -- name: restart rsyslog - service: name=rsyslog state=restarted - - name: restart ssh service: name=ssh state=restarted diff --git a/roles/security/tasks/main.yml b/roles/security/tasks/main.yml index 0f7ca09..c46e041 100644 --- a/roles/security/tasks/main.yml +++ b/roles/security/tasks/main.yml @@ -30,21 +30,6 @@ executable: /bin/bash register: privileged_programs -# Rsyslog - -- name: Rsyslog configured - template: src=rsyslog.conf.j2 dest=/etc/rsyslog.conf - notify: - - restart rsyslog - -- name: Rsyslog CIS configured - template: src=CIS.conf.j2 dest=/etc/rsyslog.d/CIS.conf owner=root group=root mode=0644 - notify: - - restart rsyslog - -- name: Enable services - service: name=rsyslog enabled=yes - # Core dumps - name: Restrict core dumps (with PAM)