From d67abef13d215b78459da62e30b30017ede8dca5 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Mon, 4 Jun 2018 16:30:25 +0200 Subject: [PATCH] minifirewall: the tail file can be overwritten, or not --- CHANGELOG.md | 5 +++-- minifirewall/defaults/main.yml | 1 + minifirewall/tasks/tail.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0f7c653..37e59591 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,11 +16,12 @@ The **patch** part changes incrementally at each release. * kibana: log messages go to /var/log/kibana/kibana.log ### Changed +* evolinux-users: add sudo right for bkctld check +* minifirewall: the tail file can be overwritten, or not (default: `True`) +* nagios-nrpe: change nrpe check for bkctld command * rbenv: install Ruby 2.5.1 by default * rbenv: switch from copy to lineinfile for default gems * squid: whiteliste some news sites -* nagios-nrpe: change nrpe check for bkctld command -* evolinux-users: add sudo right for bkctld check ### Fixed diff --git a/minifirewall/defaults/main.yml b/minifirewall/defaults/main.yml index a6eaa2fc..2b37a5cf 100644 --- a/minifirewall/defaults/main.yml +++ b/minifirewall/defaults/main.yml @@ -1,5 +1,6 @@ --- minifirewall_tail_included: False +minifirewall_tail_force: yes minifirewall_git_url: "https://forge.evolix.org/minifirewall.git" minifirewall_checkout_path: "/tmp/minifirewall" diff --git a/minifirewall/tasks/tail.yml b/minifirewall/tasks/tail.yml index 00d9c0e4..3d61025d 100644 --- a/minifirewall/tasks/tail.yml +++ b/minifirewall/tasks/tail.yml @@ -3,7 +3,7 @@ template: src: "{{ item }}" dest: /etc/default/minifirewall.tail - force: yes + force: "{{ minifirewall_tail_force | bool | ternary('yes', 'no') }}" with_first_found: - "templates/minifirewall-tail/minifirewall.{{ inventory_hostname }}.tail.j2" - "templates/minifirewall-tail/minifirewall.{{ host_group }}.tail.j2"