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

This commit is contained in:
Zuul 2022-02-10 15:31:13 +00:00 committed by Gerrit Code Review
commit 4f1f7b0387
3 changed files with 5 additions and 7 deletions

View File

@ -18,12 +18,13 @@
src: "{{ item.src }}" src: "{{ item.src }}"
dest: "{{ item.dest }}" dest: "{{ item.dest }}"
with_items: 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: notify:
- reload lsyncd - reload lsyncd
when: when:
- groups['repo_all'] | length > 1 - groups['repo_all'] | length > 1
- item.condition | bool
tags: tags:
- repo-lsyncd - repo-lsyncd
- repo-config - repo-config

View File

@ -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 }}" LSYNCD_OPTIONS="{{ repo_lsyncd_config_file }}"
{% endif %}

View File

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