From 80cdb2629412c361ae13792c7ad691a45e808151 Mon Sep 17 00:00:00 2001
From: Antoine Schildknecht <antoine.schildknecht@ubicast.eu>
Date: Wed, 3 Jun 2020 13:11:14 +0000
Subject: [PATCH] Fix ferm configuration reloading
---
roles/ferm-configure/handlers/main.yml | 5 ++---
roles/ferm-configure/tasks/main.yml | 8 ++++----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/roles/ferm-configure/handlers/main.yml b/roles/ferm-configure/handlers/main.yml
index 920efd0e..1b086e5b 100644
--- a/roles/ferm-configure/handlers/main.yml
+++ b/roles/ferm-configure/handlers/main.yml
@@ -1,9 +1,8 @@
---
-- name: restart ferm
- when: ansible_facts.services['ferm.service'] is defined
+- name: reload ferm
systemd:
name: ferm
- state: restarted
+ state: reloaded
...
diff --git a/roles/ferm-configure/tasks/main.yml b/roles/ferm-configure/tasks/main.yml
index a10cf787..8d9a916f 100644
--- a/roles/ferm-configure/tasks/main.yml
+++ b/roles/ferm-configure/tasks/main.yml
@@ -12,14 +12,14 @@
- name: global
when: ferm_global_settings | d(false)
- notify: restart ferm
+ notify: reload ferm
copy:
dest: /etc/ferm/ferm.d/{{ ferm_rules_filename }}.conf
content: "{{ ferm_global_settings }}"
- name: input
when: ferm_input_rules | length > 0
- notify: restart ferm
+ notify: reload ferm
copy:
dest: /etc/ferm/input.d/{{ ferm_rules_filename }}.conf
content: |
@@ -36,7 +36,7 @@
- name: output
when: ferm_output_rules | length > 0
- notify: restart ferm
+ notify: reload ferm
copy:
dest: /etc/ferm/output.d/{{ ferm_rules_filename }}.conf
content: |
@@ -53,7 +53,7 @@
- name: forward
when: ferm_forward_rules | length > 0
- notify: restart ferm
+ notify: reload ferm
copy:
dest: /etc/ferm/forward.d/{{ ferm_rules_filename }}.conf
content: |
--
GitLab