Merge "Ensure insist=true is always set for lsyncd"

tasks/repo_sync_manager.yml

@@ -18,12 +18,13 @@
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
   with_items:
-    - { src: "lsyncd.lua.j2", dest: "{{ repo_lsyncd_config_file }}" }
+    - { src: "lsyncd.lua.j2", dest: "{{ repo_lsyncd_config_file }}", condition: true }
-    - { src: "lsyncd.defaults.j2", dest: "{{ repo_lsyncd_defaults_file }}" }
+    - { src: "lsyncd.defaults.j2", dest: "{{ repo_lsyncd_defaults_file }}", condition: "{{ ansible_facts['pkg_mgr'] == 'dnf' }}" }
   notify:
     - reload lsyncd
   when:
     - groups['repo_all'] | length > 1
+    - item.condition | bool
   tags:
     - repo-lsyncd
     - repo-config

templates/lsyncd.defaults.j2

@@ -1,5 +1 @@
-{% if ansible_facts['os_family'] == 'Debian' %}
-DAEMON_ARGS="$DAEMON_ARGS -insist"
-{% elif ansible_facts['os_family'] == 'RedHat' %}
 LSYNCD_OPTIONS="{{ repo_lsyncd_config_file }}"
-{% endif %}

templates/lsyncd.lua.j2

@@ -609,7 +609,8 @@ rsync.delay = 15
 settings {
     logfile = "/var/log/lsyncd/lsyncd.log",
     statusFile = "/var/log/lsyncd/lsyncd-status.log",
-    statusInterval = 20
+    statusInterval = 20,
+    insist = true
 }
 
 {% for node in groups['repo_all'] %}