summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--roles/common/tasks/logging.yml2
-rw-r--r--roles/common/tasks/smart.yml2
2 files changed, 3 insertions, 1 deletions
diff --git a/roles/common/tasks/logging.yml b/roles/common/tasks/logging.yml
index 62727c9..3b86294 100644
--- a/roles/common/tasks/logging.yml
+++ b/roles/common/tasks/logging.yml
@@ -54,28 +54,30 @@
- logcheck
- name: Configure logcheck (2)
lineinfile: dest=/etc/logcheck/logcheck.logfiles
line={{ item }}
state=present
create=yes
owner=root group=logcheck
mode=0640
with_items:
- /var/log/syslog
- /var/log/auth.log
- /var/log/mail.log
tags:
- logcheck
- name: Minimal logging policy (1)
lineinfile: dest=/etc/logrotate.d/rsyslog
regexp="^/var/log/mail\\.(log|info|sasl)$"
state=absent
+ owner=root group=root
+ mode=0644
- name: Minimal logging policy (2)
copy: src=etc/logrotate.d/fripost-mail
dest=/etc/logrotate.d/fripost-mail
owner=root group=root
mode=0644
tags:
- logrotate
diff --git a/roles/common/tasks/smart.yml b/roles/common/tasks/smart.yml
index 3e2e02d..56502ea 100644
--- a/roles/common/tasks/smart.yml
+++ b/roles/common/tasks/smart.yml
@@ -1,15 +1,15 @@
- name: Install smartmontools
# apt-listbugs complains due to #706909.
apt: pkg=smartmontools
-- name: Configure smartmontools
+- name: Auto-enable smartmontools
lineinfile: dest=/etc/default/smartmontools
regexp='^(\s*#)?\s*start_smartd='
line='start_smartd=yes'
owner=root group=root
mode=0644
- name: Start smartd
service: name=smartmontools state=started
# smartd can be heavy on VMs, don't bother starting it up if it's down
when: not (ansible_processor[0] | search("^QEMU Virtual CPU .*"))