aboutsummaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorAaron LI <aly@aaronly.me>2018-04-16 19:46:18 +0800
committerAaron LI <aly@aaronly.me>2018-04-16 19:46:18 +0800
commit551151ebf10aa4bf143d63696d431062c1c7ccfa (patch)
treec223f8ef7584660bf423e33275bde50a36a896e0 /roles
parenta53f889d9d0cf79b69d8f1fd3266e7ffe5bf210e (diff)
downloadansible-dfly-vps-551151ebf10aa4bf143d63696d431062c1c7ccfa.tar.bz2
basic/periodic: Inline daily security status
Diffstat (limited to 'roles')
-rw-r--r--roles/basic/tasks/main.yml12
-rw-r--r--roles/security/tasks/main.yml6
2 files changed, 12 insertions, 6 deletions
diff --git a/roles/basic/tasks/main.yml b/roles/basic/tasks/main.yml
index 8f3903c..324ca9f 100644
--- a/roles/basic/tasks/main.yml
+++ b/roles/basic/tasks/main.yml
@@ -33,6 +33,18 @@
state: touch
mode: 0600
+- name: periodic - touch config file
+ file:
+ path: /etc/periodic.conf
+ state: touch
+ mode: 0644
+
+- name: periodic - inline daily security status
+ lineinfile:
+ path: /etc/periodic.conf
+ regexp: '^#?\s*daily_status_security_inline'
+ line: "daily_status_security_inline=YES"
+
- name: csh - install /etc/csh.cshrc
copy:
src: csh.cshrc
diff --git a/roles/security/tasks/main.yml b/roles/security/tasks/main.yml
index 1976def..043792f 100644
--- a/roles/security/tasks/main.yml
+++ b/roles/security/tasks/main.yml
@@ -27,12 +27,6 @@
dest: /etc/periodic/daily/600.clean-pf
mode: 0755
-- name: periodic - touch config file
- file:
- path: /etc/periodic.conf
- state: touch
- mode: 0644
-
- name: periodic - enable clean-pf
blockinfile:
path: /etc/periodic.conf