From 00fe225a3ce0164effde8b5a14147bb6310119ee Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Wed, 28 Jun 2023 13:22:59 +0200 Subject: [PATCH] =?UTF-8?q?force:=20[yes,no]=20=E2=86=92=20force=20[true,f?= =?UTF-8?q?alse]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + apache/tasks/auth.yml | 4 ++-- apache/tasks/log2mail.yml | 2 +- apache/tasks/main.yml | 10 +++++----- apache/tasks/server_status.yml | 2 +- apt/tasks/backports.deb822.yml | 4 ++-- apt/tasks/backports.oneline.yml | 4 ++-- apt/tasks/basics.deb822.yml | 4 ++-- apt/tasks/basics.oneline.yml | 2 +- apt/tasks/evolix_public.deb822.yml | 4 ++-- apt/tasks/evolix_public.oneline.yml | 4 ++-- apt/tasks/hold_packages.yml | 2 +- apt/tasks/migrate-to-deb822.yml | 2 +- bind/tasks/authoritative.yml | 2 +- bind/tasks/main.yml | 8 ++++---- bind/tasks/munin.yml | 2 +- bind/tasks/recursive.yml | 2 +- certbot/tasks/acme-challenge.yml | 4 ++-- certbot/tasks/install-legacy.yml | 4 ++-- docker-host/tasks/main.yml | 2 +- elasticsearch/tasks/additional_scripts.yml | 2 +- elasticsearch/tasks/apt_sources.yml | 2 +- etc-git/tasks/repository.yml | 2 +- etc-git/tasks/utils.yml | 8 ++++---- evocheck/tasks/cron.yml | 2 +- evocheck/tasks/install.yml | 4 ++-- evolinux-base/tasks/default_www.yml | 2 +- evolinux-base/tasks/dump-server-state.yml | 2 +- evolinux-base/tasks/hardware.dell.yml | 2 +- evolinux-base/tasks/hardware.hp.yml | 2 +- evolinux-base/tasks/hostname.yml | 2 +- evolinux-base/tasks/root.yml | 4 ++-- evolinux-base/tasks/system.yml | 6 +++--- evolinux-base/tasks/utils.yml | 2 +- evolinux-todo/tasks/main.yml | 2 +- evolinux-users/tasks/sudo_common.yml | 2 +- evolinux-users/tasks/sudo_jessie.yml | 2 +- evomaintenance/tasks/install_vendor_debian.yml | 2 +- evomaintenance/tasks/install_vendor_other.yml | 2 +- filebeat/tasks/apt_sources.yml | 2 +- fluentd/tasks/main.yml | 2 +- haproxy/tasks/munin.yml | 2 +- haproxy/tasks/packages_backports.yml | 2 +- jenkins/tasks/main.yml | 2 +- keepalived/tasks/main.yml | 4 ++-- kibana/tasks/apt_sources.yml | 2 +- kibana/tasks/proxy_nginx.yml | 4 ++-- kvm-host/tasks/munin.yml | 4 ++-- kvm-host/tasks/tools.yml | 6 +++--- listupgrade/tasks/main.yml | 4 ++-- logstash/tasks/apt_sources.yml | 2 +- memcached/tasks/nrpe.yml | 2 +- metricbeat/tasks/apt_sources.yml | 2 +- mongodb/tasks/main_bookworm.yml | 4 ++-- mongodb/tasks/main_bullseye.yml | 6 +++--- mongodb/tasks/main_buster.yml | 6 +++--- mongodb/tasks/main_jessie.yml | 4 ++-- mongodb/tasks/main_stretch.yml | 2 +- monit/tasks/main.yml | 2 +- mysql-oracle/tasks/config.yml | 4 ++-- mysql-oracle/tasks/packages.yml | 4 ++-- mysql-oracle/tasks/utils.yml | 4 ++-- mysql/tasks/config_jessie.yml | 2 +- mysql/tasks/config_stretch.yml | 4 ++-- mysql/tasks/mysql_skip.yml | 4 ++-- mysql/tasks/utils.yml | 12 ++++++------ nagios-nrpe/tasks/main.yml | 2 +- nagios-nrpe/tasks/wrapper.yml | 4 ++-- newrelic/tasks/sources.yml | 2 +- nginx/tasks/logrotate.yml | 2 +- nginx/tasks/main.yml | 10 +++++----- nginx/tasks/packages_backports.yml | 2 +- nginx/tasks/server_status_read.yml | 2 +- opendkim/tasks/main.yml | 4 ++-- openvpn/tasks/debian.yml | 2 +- packweb-apache/tasks/apache.yml | 4 ++-- packweb-apache/tasks/awstats.yml | 2 +- packweb-apache/tasks/phpmyadmin.yml | 4 ++-- percona/tasks/main.yml | 2 +- php/tasks/config_apache.yml | 2 +- php/tasks/config_cli.yml | 4 ++-- php/tasks/config_fpm.yml | 4 ++-- php/tasks/sury_post.yml | 6 +++--- postfix/tasks/minimal.yml | 2 +- postfix/tasks/packmail.yml | 4 ++-- postgresql/tasks/config.yml | 2 +- postgresql/tasks/logrotate.yml | 2 +- postgresql/tasks/pgdg-repo.yml | 2 +- proftpd/tasks/main.yml | 2 +- rabbitmq/tasks/main.yml | 4 ++-- rabbitmq/tasks/nrpe.yml | 4 ++-- rbenv/tasks/main.yml | 4 ++-- redis/tasks/nrpe.yml | 4 ++-- squid/tasks/logrotate_jessie.yml | 2 +- squid/tasks/logrotate_stretch.yml | 2 +- squid/tasks/main.yml | 16 ++++++++-------- squid/tasks/systemd.yml | 2 +- supervisord/tasks/main.yml | 2 +- tomcat-instance/tasks/bootstrap.yml | 6 +++--- unbound/tasks/main.yml | 2 +- varnish/tasks/main.yml | 12 ++++++------ vrrpd/tasks/ip.yml | 2 +- webapps/nextcloud/tasks/archive.yml | 4 ++-- 103 files changed, 179 insertions(+), 178 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a1dda59..16d1312e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ The **patch** part changes is incremented if multiple releases happen the same m ### Changed +* all: change syntax "force: [yes,no]" → "force [true,false]" * elasticsearch: improve networking configuration * evolinux-users: remove Stretch references in tasks that also apply to next Debian versions * mysql: improve shell syntax for mysql_skip script diff --git a/apache/tasks/auth.yml b/apache/tasks/auth.yml index 2c4d75ff..596c63e9 100644 --- a/apache/tasks/auth.yml +++ b/apache/tasks/auth.yml @@ -7,7 +7,7 @@ owner: root group: root mode: "0640" - force: no + force: false tags: - apache @@ -30,7 +30,7 @@ owner: root group: root mode: "0640" - force: no + force: false notify: reload apache tags: - apache diff --git a/apache/tasks/log2mail.yml b/apache/tasks/log2mail.yml index 42b18dae..f0f1853d 100644 --- a/apache/tasks/log2mail.yml +++ b/apache/tasks/log2mail.yml @@ -14,6 +14,6 @@ owner: log2mail group: adm mode: "0644" - force: no + force: false tags: - apache diff --git a/apache/tasks/main.yml b/apache/tasks/main.yml index c1ca9d7b..78dabc61 100644 --- a/apache/tasks/main.yml +++ b/apache/tasks/main.yml @@ -73,7 +73,7 @@ owner: root group: root mode: "0640" - force: yes + force: true notify: reload apache tags: - apache @@ -85,7 +85,7 @@ owner: root group: root mode: "0640" - force: no + force: false notify: reload apache tags: - apache @@ -119,7 +119,7 @@ src: evolinux-default.conf.j2 dest: /etc/apache2/sites-available/000-evolinux-default.conf mode: "0640" - force: no + force: false notify: reload apache tags: - apache @@ -129,7 +129,7 @@ src: /etc/apache2/sites-available/000-evolinux-default.conf dest: /etc/apache2/sites-enabled/000-default.conf state: link - force: yes + force: true notify: reload apache when: apache_evolinux_default_enabled | bool tags: @@ -181,7 +181,7 @@ src: save_apache_status.sh dest: /usr/share/scripts/save_apache_status.sh mode: "0755" - force: no + force: false tags: - apache diff --git a/apache/tasks/server_status.yml b/apache/tasks/server_status.yml index 7b188e51..271a8739 100644 --- a/apache/tasks/server_status.yml +++ b/apache/tasks/server_status.yml @@ -13,7 +13,7 @@ dest: "{{ apache_serverstatus_suffix_file }}" # The last character "\u000A" is a line feed (LF), it's better to keep it content: "{{ apache_serverstatus_suffix }}\u000A" - force: yes + force: true when: apache_serverstatus_suffix | length > 0 - name: generate random string for server-status suffix diff --git a/apt/tasks/backports.deb822.yml b/apt/tasks/backports.deb822.yml index 421e59e6..0382892d 100644 --- a/apt/tasks/backports.deb822.yml +++ b/apt/tasks/backports.deb822.yml @@ -4,7 +4,7 @@ ansible.builtin.template: src: '{{ ansible_distribution_release }}_backports.sources.j2' dest: /etc/apt/sources.list.d/backports.sources - force: yes + force: true mode: "0640" register: apt_backports_sources tags: @@ -14,7 +14,7 @@ ansible.builtin.copy: src: '{{ ansible_distribution_release }}_backports_preferences' dest: /etc/apt/preferences.d/0-backports-defaults - force: yes + force: true mode: "0640" register: apt_backports_config tags: diff --git a/apt/tasks/backports.oneline.yml b/apt/tasks/backports.oneline.yml index 9b7118b7..11de5c52 100644 --- a/apt/tasks/backports.oneline.yml +++ b/apt/tasks/backports.oneline.yml @@ -11,7 +11,7 @@ ansible.builtin.template: src: '{{ ansible_distribution_release }}_backports.list.j2' dest: /etc/apt/sources.list.d/backports.list - force: yes + force: true mode: "0640" register: apt_backports_list tags: @@ -21,7 +21,7 @@ ansible.builtin.copy: src: '{{ ansible_distribution_release }}_backports_preferences' dest: /etc/apt/preferences.d/0-backports-defaults - force: yes + force: true mode: "0640" register: apt_backports_config tags: diff --git a/apt/tasks/basics.deb822.yml b/apt/tasks/basics.deb822.yml index a8663572..617e6c92 100644 --- a/apt/tasks/basics.deb822.yml +++ b/apt/tasks/basics.deb822.yml @@ -5,7 +5,7 @@ src: "{{ ansible_distribution_release }}_basics.sources.j2" dest: /etc/apt/sources.list.d/system.sources mode: "0644" - force: yes + force: true register: apt_basic_sources tags: - apt @@ -15,7 +15,7 @@ src: "{{ ansible_distribution_release }}_security.sources.j2" dest: /etc/apt/sources.list.d/security.sources mode: "0644" - force: yes + force: true register: apt_security_sources tags: - apt diff --git a/apt/tasks/basics.oneline.yml b/apt/tasks/basics.oneline.yml index 4d457f0d..f949a0b2 100644 --- a/apt/tasks/basics.oneline.yml +++ b/apt/tasks/basics.oneline.yml @@ -5,7 +5,7 @@ src: "{{ ansible_distribution_release }}_basics.list.j2" dest: /etc/apt/sources.list mode: "0644" - force: yes + force: true register: apt_basic_list tags: - apt diff --git a/apt/tasks/evolix_public.deb822.yml b/apt/tasks/evolix_public.deb822.yml index 036645e7..84d193b3 100644 --- a/apt/tasks/evolix_public.deb822.yml +++ b/apt/tasks/evolix_public.deb822.yml @@ -20,7 +20,7 @@ ansible.builtin.copy: src: pub_evolix.asc dest: "{{ apt_keyring_dir }}/pub_evolix.asc" - force: yes + force: true mode: "0644" owner: root group: root @@ -31,7 +31,7 @@ ansible.builtin.template: src: evolix_public.sources.j2 dest: /etc/apt/sources.list.d/evolix_public.sources - force: yes + force: true mode: "0640" register: apt_evolix_public tags: diff --git a/apt/tasks/evolix_public.oneline.yml b/apt/tasks/evolix_public.oneline.yml index 9c502a33..deff0b7d 100644 --- a/apt/tasks/evolix_public.oneline.yml +++ b/apt/tasks/evolix_public.oneline.yml @@ -20,7 +20,7 @@ ansible.builtin.copy: src: pub_evolix.asc dest: "{{ apt_keyring_dir }}/pub_evolix.asc" - force: yes + force: true mode: "0644" owner: root group: root @@ -31,7 +31,7 @@ ansible.builtin.template: src: evolix_public.list.j2 dest: /etc/apt/sources.list.d/evolix_public.list - force: yes + force: true mode: "0640" register: apt_evolix_public tags: diff --git a/apt/tasks/hold_packages.yml b/apt/tasks/hold_packages.yml index 26ced4c7..e92b7b44 100644 --- a/apt/tasks/hold_packages.yml +++ b/apt/tasks/hold_packages.yml @@ -71,7 +71,7 @@ ansible.builtin.copy: src: check_held_packages.sh dest: /usr/share/scripts/check_held_packages.sh - force: yes + force: true mode: "0755" tags: - apt diff --git a/apt/tasks/migrate-to-deb822.yml b/apt/tasks/migrate-to-deb822.yml index 60ee0f2c..18aa1580 100644 --- a/apt/tasks/migrate-to-deb822.yml +++ b/apt/tasks/migrate-to-deb822.yml @@ -16,7 +16,7 @@ ansible.builtin.copy: src: "{{ item }}" dest: "/usr/share/scripts/{{ item }}" - force: yes + force: true mode: "0755" loop: - deb822-migration.py diff --git a/bind/tasks/authoritative.yml b/bind/tasks/authoritative.yml index abfa96d8..7fbd827d 100644 --- a/bind/tasks/authoritative.yml +++ b/bind/tasks/authoritative.yml @@ -7,5 +7,5 @@ owner: bind group: bind mode: "0644" - force: yes + force: true notify: restart bind \ No newline at end of file diff --git a/bind/tasks/main.yml b/bind/tasks/main.yml index 67776531..1e20eee2 100644 --- a/bind/tasks/main.yml +++ b/bind/tasks/main.yml @@ -23,7 +23,7 @@ owner: root group: root mode: "0644" - force: yes + force: true notify: restart apparmor when: check_apparmor.rc == 0 @@ -47,7 +47,7 @@ owner: root group: root mode: "0644" - force: yes + force: true notify: - reload systemd - restart bind @@ -77,7 +77,7 @@ dest: /root/chroot-bind.sh mode: "0700" owner: root - force: yes + force: true backup: yes when: bind_chroot_set | bool @@ -109,7 +109,7 @@ owner: root group: root mode: "0644" - force: yes + force: true notify: restart bind - ansible.builtin.include: munin.yml diff --git a/bind/tasks/munin.yml b/bind/tasks/munin.yml index 4a655533..fee99750 100644 --- a/bind/tasks/munin.yml +++ b/bind/tasks/munin.yml @@ -48,7 +48,7 @@ owner: root group: root mode: "0644" - force: yes + force: true notify: restart munin-node tags: - bind diff --git a/bind/tasks/recursive.yml b/bind/tasks/recursive.yml index 364f1021..887f206e 100644 --- a/bind/tasks/recursive.yml +++ b/bind/tasks/recursive.yml @@ -8,7 +8,7 @@ owner: bind group: bind mode: "0644" - force: yes + force: true notify: restart bind - name: enable zones.rfc1918 for recursive server diff --git a/certbot/tasks/acme-challenge.yml b/certbot/tasks/acme-challenge.yml index 29c0267d..acd93fe0 100644 --- a/certbot/tasks/acme-challenge.yml +++ b/certbot/tasks/acme-challenge.yml @@ -15,7 +15,7 @@ ansible.builtin.template: src: acme-challenge/nginx.conf.j2 dest: /etc/nginx/snippets/letsencrypt.conf - force: yes + force: true notify: reload nginx when: is_nginx.stat.exists @@ -30,7 +30,7 @@ ansible.builtin.template: src: acme-challenge/apache.conf.j2 dest: /etc/apache2/conf-available/letsencrypt.conf - force: yes + force: true notify: reload apache - name: ACME challenge for Apache is enabled diff --git a/certbot/tasks/install-legacy.yml b/certbot/tasks/install-legacy.yml index 3048a4a4..157c8dc1 100644 --- a/certbot/tasks/install-legacy.yml +++ b/certbot/tasks/install-legacy.yml @@ -16,7 +16,7 @@ mode: '0755' owner: root group: root - force: yes + force: true notify: install letsencrypt-auto - name: Check certbot script @@ -49,7 +49,7 @@ ansible.builtin.copy: src: cron_jessie dest: /etc/cron.d/certbot - force: yes + force: true when: certbot_custom_crontab | bool - name: disable self-upgrade diff --git a/docker-host/tasks/main.yml b/docker-host/tasks/main.yml index db57a6b6..f4175297 100644 --- a/docker-host/tasks/main.yml +++ b/docker-host/tasks/main.yml @@ -26,7 +26,7 @@ ansible.builtin.copy: src: docker-debian.asc dest: "{{ apt_keyring_dir }}/docker-debian.asc" - force: yes + force: true mode: "0644" owner: root group: root diff --git a/elasticsearch/tasks/additional_scripts.yml b/elasticsearch/tasks/additional_scripts.yml index 8dcb0759..abda3090 100644 --- a/elasticsearch/tasks/additional_scripts.yml +++ b/elasticsearch/tasks/additional_scripts.yml @@ -19,4 +19,4 @@ mode: "0755" owner: "root" group: "root" - force: yes + force: true diff --git a/elasticsearch/tasks/apt_sources.yml b/elasticsearch/tasks/apt_sources.yml index a0395ffe..e525ba4b 100644 --- a/elasticsearch/tasks/apt_sources.yml +++ b/elasticsearch/tasks/apt_sources.yml @@ -9,7 +9,7 @@ ansible.builtin.copy: src: elastic.asc dest: "{{ apt_keyring_dir }}/elastic.asc" - force: yes + force: true mode: "0644" owner: root group: root diff --git a/etc-git/tasks/repository.yml b/etc-git/tasks/repository.yml index 1601a157..426eab41 100644 --- a/etc-git/tasks/repository.yml +++ b/etc-git/tasks/repository.yml @@ -38,7 +38,7 @@ dest: "{{ repository_path }}/.gitignore" owner: root mode: "0600" - force: no + force: false tags: - etc-git diff --git a/etc-git/tasks/utils.yml b/etc-git/tasks/utils.yml index b54e1c61..e33589b3 100644 --- a/etc-git/tasks/utils.yml +++ b/etc-git/tasks/utils.yml @@ -10,7 +10,7 @@ src: evocommit dest: /usr/local/bin/evocommit mode: "0755" - force: yes + force: true tags: - etc-git @@ -19,7 +19,7 @@ src: ansible-commit dest: /usr/local/bin/ansible-commit mode: "0755" - force: yes + force: true tags: - etc-git @@ -28,7 +28,7 @@ src: etc-git-optimize dest: /usr/share/scripts/etc-git-optimize mode: "0755" - force: yes + force: true tags: - etc-git @@ -37,7 +37,7 @@ src: etc-git-status dest: /usr/share/scripts/etc-git-status mode: "0755" - force: yes + force: true tags: - etc-git diff --git a/evocheck/tasks/cron.yml b/evocheck/tasks/cron.yml index cfea8ca2..4e9c249e 100644 --- a/evocheck/tasks/cron.yml +++ b/evocheck/tasks/cron.yml @@ -16,5 +16,5 @@ mode: "0644" owner: root group: root - force: yes + force: true when: is_cron_installed.rc == 0 diff --git a/evocheck/tasks/install.yml b/evocheck/tasks/install.yml index b210302b..d1c1daf0 100644 --- a/evocheck/tasks/install.yml +++ b/evocheck/tasks/install.yml @@ -36,7 +36,7 @@ dest: "{{ evocheck_bin_dir }}/evocheck.sh" mode: "0700" owner: root - force: yes + force: true tags: - evocheck @@ -44,6 +44,6 @@ ansible.builtin.copy: src: evocheck.cf dest: /etc/evocheck.cf - force: no + force: false tags: - evocheck diff --git a/evolinux-base/tasks/default_www.yml b/evolinux-base/tasks/default_www.yml index 2d94fe2b..673ac397 100644 --- a/evolinux-base/tasks/default_www.yml +++ b/evolinux-base/tasks/default_www.yml @@ -20,7 +20,7 @@ src: default_www/index.html.j2 dest: /var/www/index.html mode: "0644" - force: no + force: false when: evolinux_default_www_files | bool # SSL cert diff --git a/evolinux-base/tasks/dump-server-state.yml b/evolinux-base/tasks/dump-server-state.yml index 33822377..65ff2f45 100644 --- a/evolinux-base/tasks/dump-server-state.yml +++ b/evolinux-base/tasks/dump-server-state.yml @@ -12,4 +12,4 @@ src: /usr/local/sbin/dump-server-state dest: /usr/local/sbin/backup-server-state state: link - force: yes + force: true diff --git a/evolinux-base/tasks/hardware.dell.yml b/evolinux-base/tasks/hardware.dell.yml index a146ec5c..532b3f58 100644 --- a/evolinux-base/tasks/hardware.dell.yml +++ b/evolinux-base/tasks/hardware.dell.yml @@ -47,7 +47,7 @@ ansible.builtin.copy: src: hwraid.le-vert.net.asc dest: "{{ apt_keyring_dir }}/hwraid.le-vert.net.asc" - force: yes + force: true mode: "0644" owner: root group: root diff --git a/evolinux-base/tasks/hardware.hp.yml b/evolinux-base/tasks/hardware.hp.yml index ea17cae5..a22eeb70 100644 --- a/evolinux-base/tasks/hardware.hp.yml +++ b/evolinux-base/tasks/hardware.hp.yml @@ -4,7 +4,7 @@ ansible.builtin.copy: src: hpePublicKey2048_key1.asc dest: "{{ apt_keyring_dir }}/hpePublicKey2048_key1.asc" - force: yes + force: true mode: "0644" owner: root group: root diff --git a/evolinux-base/tasks/hostname.yml b/evolinux-base/tasks/hostname.yml index b283a51e..a361ee44 100644 --- a/evolinux-base/tasks/hostname.yml +++ b/evolinux-base/tasks/hostname.yml @@ -41,7 +41,7 @@ ansible.builtin.copy: dest: /etc/mailname content: "{{ evolinux_fqdn }}\n" - force: yes + force: true when: evolinux_hostname_mailname | bool # Override facts diff --git a/evolinux-base/tasks/root.yml b/evolinux-base/tasks/root.yml index 3b17faf7..98cd3b3d 100644 --- a/evolinux-base/tasks/root.yml +++ b/evolinux-base/tasks/root.yml @@ -27,7 +27,7 @@ ansible.builtin.copy: content: "" dest: "/root/.bash_history" - force: no + force: false when: evolinux_root_bash_history | bool - name: Set umask in /root/.profile @@ -47,7 +47,7 @@ ansible.builtin.copy: src: root/gitconfig dest: "/root/.gitconfig" - force: no + force: false when: evolinux_root_gitconfig | bool - name: Is .bash_history append-only diff --git a/evolinux-base/tasks/system.yml b/evolinux-base/tasks/system.yml index ecad62d9..8f3d7b03 100644 --- a/evolinux-base/tasks/system.yml +++ b/evolinux-base/tasks/system.yml @@ -138,7 +138,7 @@ ansible.builtin.template: src: system/alert5.sysvinit.j2 dest: /etc/init.d/alert5 - force: no + force: false mode: "0755" when: - evolinux_system_alert5_init | bool @@ -159,7 +159,7 @@ ansible.builtin.template: src: system/alert5.sh.j2 dest: /usr/share/scripts/alert5.sh - force: no + force: false mode: "0755" when: - evolinux_system_alert5_init | bool @@ -169,7 +169,7 @@ ansible.builtin.copy: src: alert5.service dest: /etc/systemd/system/alert5.service - force: yes + force: true mode: "0644" when: - evolinux_system_alert5_init | bool diff --git a/evolinux-base/tasks/utils.yml b/evolinux-base/tasks/utils.yml index a97be579..a1c4d646 100644 --- a/evolinux-base/tasks/utils.yml +++ b/evolinux-base/tasks/utils.yml @@ -13,7 +13,7 @@ mode: "0700" owner: root group: root - force: no + force: false - name: update-evobackup-canary script is present ansible.builtin.copy: diff --git a/evolinux-todo/tasks/main.yml b/evolinux-todo/tasks/main.yml index 0cf5628c..9b0d9c80 100644 --- a/evolinux-todo/tasks/main.yml +++ b/evolinux-todo/tasks/main.yml @@ -12,5 +12,5 @@ src: todo.defaults.txt dest: /etc/evolinux/todo.txt mode: "0640" - force: no + force: false when: ansible_distribution == "Debian" diff --git a/evolinux-users/tasks/sudo_common.yml b/evolinux-users/tasks/sudo_common.yml index 0560f997..0f463756 100644 --- a/evolinux-users/tasks/sudo_common.yml +++ b/evolinux-users/tasks/sudo_common.yml @@ -12,7 +12,7 @@ ansible.builtin.template: src: sudoers.j2 dest: /etc/sudoers.d/evolinux - force: no + force: false mode: "0440" validate: '/usr/sbin/visudo -cf %s' register: copy_sudoers_evolinux diff --git a/evolinux-users/tasks/sudo_jessie.yml b/evolinux-users/tasks/sudo_jessie.yml index 6400a8ee..2cc50500 100644 --- a/evolinux-users/tasks/sudo_jessie.yml +++ b/evolinux-users/tasks/sudo_jessie.yml @@ -4,7 +4,7 @@ ansible.builtin.template: src: sudoers_jessie.j2 dest: /etc/sudoers.d/evolinux - force: no + force: false mode: "0440" validate: '/usr/sbin/visudo -cf %s' register: copy_sudoers_evolinux diff --git a/evomaintenance/tasks/install_vendor_debian.yml b/evomaintenance/tasks/install_vendor_debian.yml index c8fb6183..7241081c 100644 --- a/evomaintenance/tasks/install_vendor_debian.yml +++ b/evomaintenance/tasks/install_vendor_debian.yml @@ -40,7 +40,7 @@ owner: root group: root mode: "{{ item.mode }}" - force: yes + force: true backup: yes loop: - { src: 'evomaintenance.sh', dest: '/usr/share/scripts/', mode: '0700' } diff --git a/evomaintenance/tasks/install_vendor_other.yml b/evomaintenance/tasks/install_vendor_other.yml index ece9aae2..32387b39 100644 --- a/evomaintenance/tasks/install_vendor_other.yml +++ b/evomaintenance/tasks/install_vendor_other.yml @@ -22,7 +22,7 @@ owner: root group: root mode: "{{ item.mode }}" - force: yes + force: true backup: yes loop: - { src: 'evomaintenance.sh', dest: '/usr/share/scripts/', mode: '0700' } diff --git a/filebeat/tasks/apt_sources.yml b/filebeat/tasks/apt_sources.yml index a0395ffe..e525ba4b 100644 --- a/filebeat/tasks/apt_sources.yml +++ b/filebeat/tasks/apt_sources.yml @@ -9,7 +9,7 @@ ansible.builtin.copy: src: elastic.asc dest: "{{ apt_keyring_dir }}/elastic.asc" - force: yes + force: true mode: "0644" owner: root group: root diff --git a/fluentd/tasks/main.yml b/fluentd/tasks/main.yml index b6f262c1..9f350bf4 100644 --- a/fluentd/tasks/main.yml +++ b/fluentd/tasks/main.yml @@ -4,7 +4,7 @@ ansible.builtin.copy: src: treasuredata.asc dest: "{{ apt_keyring_dir }}/treasuredata.asc" - force: yes + force: true mode: "0644" owner: root group: root diff --git a/haproxy/tasks/munin.yml b/haproxy/tasks/munin.yml index e2f2302d..f7a35e56 100644 --- a/haproxy/tasks/munin.yml +++ b/haproxy/tasks/munin.yml @@ -12,7 +12,7 @@ ansible.builtin.file: src: /usr/share/munin/plugins/haproxy_ng dest: /etc/munin/plugins/haproxy_ng - force: yes + force: true state: link notify: restart munin-node tags: diff --git a/haproxy/tasks/packages_backports.yml b/haproxy/tasks/packages_backports.yml index 5832c4d4..2a5a855c 100644 --- a/haproxy/tasks/packages_backports.yml +++ b/haproxy/tasks/packages_backports.yml @@ -23,7 +23,7 @@ ansible.builtin.template: src: haproxy_apt_preferences.j2 dest: /etc/apt/preferences.d/999-haproxy - force: yes + force: true mode: "0640" register: haproxy_apt_preferences tags: diff --git a/jenkins/tasks/main.yml b/jenkins/tasks/main.yml index 1e6b777b..835d3a3e 100644 --- a/jenkins/tasks/main.yml +++ b/jenkins/tasks/main.yml @@ -9,7 +9,7 @@ ansible.builtin.copy: src: jenkins.asc dest: "{{ apt_keyring_dir }}/jenkins.asc" - force: yes + force: true mode: "0644" owner: root group: root diff --git a/keepalived/tasks/main.yml b/keepalived/tasks/main.yml index 3ab0f8be..30f9557a 100644 --- a/keepalived/tasks/main.yml +++ b/keepalived/tasks/main.yml @@ -14,7 +14,7 @@ mode: "0755" owner: root group: root - force: yes + force: true notify: restart keepalived tags: - keepalived @@ -27,7 +27,7 @@ mode: "0755" owner: root group: root - force: yes + force: true tags: - keepalived - nrpe diff --git a/kibana/tasks/apt_sources.yml b/kibana/tasks/apt_sources.yml index a0395ffe..e525ba4b 100644 --- a/kibana/tasks/apt_sources.yml +++ b/kibana/tasks/apt_sources.yml @@ -9,7 +9,7 @@ ansible.builtin.copy: src: elastic.asc dest: "{{ apt_keyring_dir }}/elastic.asc" - force: yes + force: true mode: "0644" owner: root group: root diff --git a/kibana/tasks/proxy_nginx.yml b/kibana/tasks/proxy_nginx.yml index 7b680284..e3b672b8 100644 --- a/kibana/tasks/proxy_nginx.yml +++ b/kibana/tasks/proxy_nginx.yml @@ -4,13 +4,13 @@ ansible.builtin.template: src: nginx_proxy_kibana_ssl.j2 dest: /etc/nginx/sites-available/kibana_ssl.conf - force: no + force: false - name: Example proxy for Kibana with Nginx (without SSL) ansible.builtin.template: src: nginx_proxy_kibana_nossl.j2 dest: /etc/nginx/sites-available/kibana_nossl.conf - force: no + force: false # - name: Kibana host in Nginx is enabled # file: diff --git a/kvm-host/tasks/munin.yml b/kvm-host/tasks/munin.yml index 45edc8d6..8cd45cb5 100644 --- a/kvm-host/tasks/munin.yml +++ b/kvm-host/tasks/munin.yml @@ -20,7 +20,7 @@ url: "https://raw.githubusercontent.com/munin-monitoring/contrib/master/plugins/libvirt/{{ item }}" dest: "/usr/local/share/munin/plugins/" mode: "0755" - force: no + force: false loop: - kvm_cpu - kvm_io @@ -32,7 +32,7 @@ src: "/usr/local/share/munin/plugins/{{ plugin_name }}" dest: "/etc/munin/plugins/{{ plugin_name }}" state: link - force: yes + force: true loop: - kvm_cpu - kvm_io diff --git a/kvm-host/tasks/tools.yml b/kvm-host/tasks/tools.yml index 7931f541..fccf9307 100644 --- a/kvm-host/tasks/tools.yml +++ b/kvm-host/tasks/tools.yml @@ -17,7 +17,7 @@ mode: "0700" owner: root group: root - force: yes + force: true - name: migrate-vm script is present ansible.builtin.copy: @@ -26,7 +26,7 @@ mode: "0700" owner: root group: root - force: yes + force: true - name: kvmstats script is present ansible.builtin.copy: @@ -35,7 +35,7 @@ mode: "0700" owner: root group: root - force: yes + force: true - name: kvmstats cron is present ansible.builtin.template: diff --git a/listupgrade/tasks/main.yml b/listupgrade/tasks/main.yml index e3f308ef..dec4881d 100644 --- a/listupgrade/tasks/main.yml +++ b/listupgrade/tasks/main.yml @@ -18,7 +18,7 @@ mode: "0700" owner: root group: root - force: yes + force: true - name: Create /etc/evolinux ansible.builtin.file: @@ -35,7 +35,7 @@ mode: "0600" owner: root group: root - force: no + force: false - name: Cron.d is present ansible.builtin.file: diff --git a/logstash/tasks/apt_sources.yml b/logstash/tasks/apt_sources.yml index a0395ffe..e525ba4b 100644 --- a/logstash/tasks/apt_sources.yml +++ b/logstash/tasks/apt_sources.yml @@ -9,7 +9,7 @@ ansible.builtin.copy: src: elastic.asc dest: "{{ apt_keyring_dir }}/elastic.asc" - force: yes + force: true mode: "0644" owner: root group: root diff --git a/memcached/tasks/nrpe.yml b/memcached/tasks/nrpe.yml index a01cf1e7..aba43da6 100644 --- a/memcached/tasks/nrpe.yml +++ b/memcached/tasks/nrpe.yml @@ -25,7 +25,7 @@ ansible.builtin.copy: src: check_memcached_instances.sh dest: /usr/local/lib/nagios/plugins/check_memcached_instances - force: yes + force: true mode: "0755" owner: root group: root diff --git a/metricbeat/tasks/apt_sources.yml b/metricbeat/tasks/apt_sources.yml index a0395ffe..e525ba4b 100644 --- a/metricbeat/tasks/apt_sources.yml +++ b/metricbeat/tasks/apt_sources.yml @@ -9,7 +9,7 @@ ansible.builtin.copy: src: elastic.asc dest: "{{ apt_keyring_dir }}/elastic.asc" - force: yes + force: true mode: "0644" owner: root group: root diff --git a/mongodb/tasks/main_bookworm.yml b/mongodb/tasks/main_bookworm.yml index ef64f00c..93989230 100644 --- a/mongodb/tasks/main_bookworm.yml +++ b/mongodb/tasks/main_bookworm.yml @@ -52,7 +52,7 @@ ansible.builtin.template: src: logrotate_bullseye.j2 dest: /etc/logrotate.d/mongodb - force: yes + force: true backup: no - ansible.builtin.include_role: @@ -74,7 +74,7 @@ ansible.builtin.copy: src: "munin/{{ item }}" dest: '/usr/local/share/munin/plugins/{{ item }}' - force: yes + force: true loop: - mongo_btree - mongo_collections diff --git a/mongodb/tasks/main_bullseye.yml b/mongodb/tasks/main_bullseye.yml index 4a02ee9b..0cfebf20 100644 --- a/mongodb/tasks/main_bullseye.yml +++ b/mongodb/tasks/main_bullseye.yml @@ -10,7 +10,7 @@ ansible.builtin.copy: src: "server-{{ mongodb_version }}.asc" dest: "{{ apt_keyring_dir }}/mongodb-server-{{ mongodb_version }}.asc" - force: yes + force: true mode: "0644" owner: root group: root @@ -51,7 +51,7 @@ ansible.builtin.template: src: logrotate_bullseye.j2 dest: /etc/logrotate.d/mongodb - force: yes + force: true backup: no - ansible.builtin.include_role: @@ -73,7 +73,7 @@ ansible.builtin.copy: src: "munin/{{ item }}" dest: '/usr/local/share/munin/plugins/{{ item }}' - force: yes + force: true loop: - mongo_btree - mongo_collections diff --git a/mongodb/tasks/main_buster.yml b/mongodb/tasks/main_buster.yml index 415a5a3f..7d47ed25 100644 --- a/mongodb/tasks/main_buster.yml +++ b/mongodb/tasks/main_buster.yml @@ -16,7 +16,7 @@ ansible.builtin.copy: src: "server-{{ mongodb_version }}.asc" dest: "{{ apt_keyring_dir }}/mongodb-server-{{ mongodb_version }}.asc" - force: yes + force: true mode: "0644" owner: root group: root @@ -65,7 +65,7 @@ ansible.builtin.template: src: logrotate_buster.j2 dest: /etc/logrotate.d/mongodb - force: yes + force: true backup: no - ansible.builtin.include_role: @@ -87,7 +87,7 @@ ansible.builtin.copy: src: "munin/{{ item }}" dest: '/usr/local/share/munin/plugins/{{ item }}' - force: yes + force: true loop: - mongo_btree - mongo_collections diff --git a/mongodb/tasks/main_jessie.yml b/mongodb/tasks/main_jessie.yml index 61d57f85..50767d68 100644 --- a/mongodb/tasks/main_jessie.yml +++ b/mongodb/tasks/main_jessie.yml @@ -16,7 +16,7 @@ ansible.builtin.copy: src: "server-{{ mongodb_version }}.asc" dest: "/etc/apt/trusted.gpg.d/mongodb-server-{{ mongodb_version }}.asc" - force: yes + force: true mode: "0644" owner: root group: root @@ -57,5 +57,5 @@ ansible.builtin.template: src: logrotate_jessie.j2 dest: /etc/logrotate.d/mongodb - force: yes + force: true backup: no diff --git a/mongodb/tasks/main_stretch.yml b/mongodb/tasks/main_stretch.yml index 0dc33fcf..5b9a84c0 100644 --- a/mongodb/tasks/main_stretch.yml +++ b/mongodb/tasks/main_stretch.yml @@ -28,7 +28,7 @@ ansible.builtin.template: src: logrotate_stretch.j2 dest: /etc/logrotate.d/mongodb-server - force: yes + force: true backup: no - name: disable previous logrotate diff --git a/monit/tasks/main.yml b/monit/tasks/main.yml index 49e4c99b..65deb5f9 100644 --- a/monit/tasks/main.yml +++ b/monit/tasks/main.yml @@ -13,7 +13,7 @@ src: evolinux-defaults.conf.j2 dest: /etc/monit/conf.d/z-evolinux-defaults.conf mode: "0640" - force: yes + force: true notify: restart monit tags: - monit diff --git a/mysql-oracle/tasks/config.yml b/mysql-oracle/tasks/config.yml index ff42ed20..0a3370ab 100644 --- a/mysql-oracle/tasks/config.yml +++ b/mysql-oracle/tasks/config.yml @@ -10,7 +10,7 @@ owner: root group: root mode: "0644" - force: yes + force: true tags: - mysql @@ -21,6 +21,6 @@ owner: root group: root mode: "0644" - force: no + force: false tags: - mysql diff --git a/mysql-oracle/tasks/packages.yml b/mysql-oracle/tasks/packages.yml index 7ceadd89..ede629f5 100644 --- a/mysql-oracle/tasks/packages.yml +++ b/mysql-oracle/tasks/packages.yml @@ -51,7 +51,7 @@ mode: "0755" owner: root group: root - force: yes + force: true - name: systemd unit is installed ansible.builtin.copy: @@ -60,7 +60,7 @@ mode: "0644" owner: root group: root - force: yes + force: true register: mysql_systemd_unit - name: APT cache is up-to-date diff --git a/mysql-oracle/tasks/utils.yml b/mysql-oracle/tasks/utils.yml index cbcc9e37..2504eaa2 100644 --- a/mysql-oracle/tasks/utils.yml +++ b/mysql-oracle/tasks/utils.yml @@ -75,7 +75,7 @@ mode: "0755" owner: root group: staff - force: yes + force: true tags: - mytop - mysql @@ -96,7 +96,7 @@ src: mytop-config.j2 dest: /root/.mytop mode: "0600" - force: yes + force: true tags: - mytop - mysql diff --git a/mysql/tasks/config_jessie.yml b/mysql/tasks/config_jessie.yml index 174fc56a..3d8c494d 100644 --- a/mysql/tasks/config_jessie.yml +++ b/mysql/tasks/config_jessie.yml @@ -10,7 +10,7 @@ owner: root group: root mode: "0644" - force: yes + force: true tags: - mysql diff --git a/mysql/tasks/config_stretch.yml b/mysql/tasks/config_stretch.yml index cda4867c..57346fb5 100644 --- a/mysql/tasks/config_stretch.yml +++ b/mysql/tasks/config_stretch.yml @@ -10,7 +10,7 @@ owner: root group: root mode: "0644" - force: yes + force: true notify: "{{ mysql_restart_handler_name }}" tags: - mysql @@ -36,7 +36,7 @@ ansible.builtin.template: src: mariadb.systemd.j2 dest: /etc/systemd/system/mariadb.service.d/evolinux.conf - force: yes + force: true register: mariadb_systemd_override - name: reload systemd and restart MariaDB diff --git a/mysql/tasks/mysql_skip.yml b/mysql/tasks/mysql_skip.yml index 2455641a..e98567a7 100644 --- a/mysql/tasks/mysql_skip.yml +++ b/mysql/tasks/mysql_skip.yml @@ -7,7 +7,7 @@ owner: root group: root mode: "0700" - force: yes + force: true tags: - mysql_skip @@ -45,7 +45,7 @@ ansible.builtin.template: src: mysql_skip.systemd.j2 dest: /etc/systemd/system/mysql_skip.service - force: yes + force: true - name: "Start or stop systemd unit" ansible.builtin.systemd: diff --git a/mysql/tasks/utils.yml b/mysql/tasks/utils.yml index f8005ee2..9d81514a 100644 --- a/mysql/tasks/utils.yml +++ b/mysql/tasks/utils.yml @@ -76,7 +76,7 @@ src: mytop.j2 dest: /root/.mytop mode: "0600" - force: yes + force: true tags: - mytop - mysql @@ -87,7 +87,7 @@ src: mytop.bullseye.j2 dest: /root/.mytop mode: "0600" - force: yes + force: true tags: - mytop - mysql @@ -220,7 +220,7 @@ src: save_mysql_processlist.sh dest: "{{ _mysql_scripts_dir }}/save_mysql_processlist.sh" mode: "0755" - force: no + force: false tags: - mysql @@ -229,7 +229,7 @@ src: mysql_connections.sh dest: "{{ _mysql_scripts_dir }}/mysql_connections" mode: "0755" - force: no + force: false tags: - mysql @@ -238,7 +238,7 @@ src: mysql-queries-killer.sh dest: "{{ _mysql_scripts_dir }}/mysql-queries-killer.sh" mode: "0755" - force: no + force: false tags: - mysql @@ -247,6 +247,6 @@ src: evomariabackup.sh dest: "{{ _mysql_scripts_dir }}/evomariabackup" mode: "0755" - force: no + force: false tags: - mysql \ No newline at end of file diff --git a/nagios-nrpe/tasks/main.yml b/nagios-nrpe/tasks/main.yml index f78f9fbf..aa36f9c9 100644 --- a/nagios-nrpe/tasks/main.yml +++ b/nagios-nrpe/tasks/main.yml @@ -30,7 +30,7 @@ dest: /etc/nagios/nrpe.d/evolix.cfg group: nagios mode: "0640" - force: no + force: false notify: restart nagios-nrpe-server tags: - nagios-nrpe diff --git a/nagios-nrpe/tasks/wrapper.yml b/nagios-nrpe/tasks/wrapper.yml index add493fd..4eb98350 100644 --- a/nagios-nrpe/tasks/wrapper.yml +++ b/nagios-nrpe/tasks/wrapper.yml @@ -24,7 +24,7 @@ owner: root group: root mode: "0750" - force: yes + force: true - name: "symlink for backward compatibility" ansible.builtin.file: @@ -40,4 +40,4 @@ owner: root group: staff mode: "0755" - force: yes \ No newline at end of file + force: true \ No newline at end of file diff --git a/newrelic/tasks/sources.yml b/newrelic/tasks/sources.yml index 22473df1..3f745db9 100644 --- a/newrelic/tasks/sources.yml +++ b/newrelic/tasks/sources.yml @@ -4,7 +4,7 @@ ansible.builtin.copy: src: newrelic.asc dest: "{{ apt_keyring_dir }}/newrelic.asc" - force: yes + force: true mode: "0644" owner: root group: root diff --git a/nginx/tasks/logrotate.yml b/nginx/tasks/logrotate.yml index d475e419..9081ef41 100644 --- a/nginx/tasks/logrotate.yml +++ b/nginx/tasks/logrotate.yml @@ -4,7 +4,7 @@ ansible.builtin.copy: src: logrotate_nginx dest: /etc/logrotate.d/nginx - force: no + force: false tags: - nginx - logrotate diff --git a/nginx/tasks/main.yml b/nginx/tasks/main.yml index aec36bec..1284a6a1 100644 --- a/nginx/tasks/main.yml +++ b/nginx/tasks/main.yml @@ -40,7 +40,7 @@ src: nginx/evolinux-defaults.conf dest: /etc/nginx/conf.d/z-evolinux-defaults.conf mode: "0640" - # force: yes + # force: true notify: reload nginx tags: - nginx @@ -57,7 +57,7 @@ group: www-data directory_mode: "0640" mode: "0640" - force: no + force: false notify: reload nginx tags: - nginx @@ -74,7 +74,7 @@ group: www-data directory_mode: "0640" mode: "0640" - force: no + force: false notify: reload nginx tags: - nginx @@ -88,7 +88,7 @@ group: www-data directory_mode: "0640" mode: "0640" - force: no + force: false notify: reload nginx tags: - nginx @@ -128,7 +128,7 @@ src: /etc/nginx/sites-available/evolinux-default.conf dest: /etc/nginx/sites-enabled/default state: link - force: yes + force: true notify: reload nginx when: nginx_evolinux_default_enabled | bool tags: diff --git a/nginx/tasks/packages_backports.yml b/nginx/tasks/packages_backports.yml index aac2304d..88402bb9 100644 --- a/nginx/tasks/packages_backports.yml +++ b/nginx/tasks/packages_backports.yml @@ -12,7 +12,7 @@ ansible.builtin.template: src: apt/nginx_preferences dest: /etc/apt/preferences.d/999-nginx - force: yes + force: true mode: "0640" register: nginx_apt_preferences tags: diff --git a/nginx/tasks/server_status_read.yml b/nginx/tasks/server_status_read.yml index e97d898a..d6cecbe3 100644 --- a/nginx/tasks/server_status_read.yml +++ b/nginx/tasks/server_status_read.yml @@ -13,7 +13,7 @@ dest: "{{ nginx_serverstatus_suffix_file }}" # The last character "\u000A" is a line feed (LF), it's better to keep it content: "{{ nginx_serverstatus_suffix }}\u000A" - force: yes + force: true when: nginx_serverstatus_suffix | length > 0 - name: generate random string for server-status suffix diff --git a/opendkim/tasks/main.yml b/opendkim/tasks/main.yml index 96a521b5..a9c1bf49 100644 --- a/opendkim/tasks/main.yml +++ b/opendkim/tasks/main.yml @@ -60,7 +60,7 @@ src: opendkim-evolix.conf dest: /etc/opendkim-evolix.conf mode: "0644" - force: yes + force: true notify: restart opendkim tags: - opendkim @@ -72,7 +72,7 @@ owner: opendkim group: opendkim mode: "0750" - force: yes + force: true tags: - opendkim diff --git a/openvpn/tasks/debian.yml b/openvpn/tasks/debian.yml index 9810a472..173299b4 100644 --- a/openvpn/tasks/debian.yml +++ b/openvpn/tasks/debian.yml @@ -154,7 +154,7 @@ ansible.builtin.copy: src: logrotate_openvpn dest: /etc/logrotate.d/openvpn - force: no + force: false - name: Generate a password for the management interface ansible.builtin.set_fact: diff --git a/packweb-apache/tasks/apache.yml b/packweb-apache/tasks/apache.yml index 434e75d0..b7e05f71 100644 --- a/packweb-apache/tasks/apache.yml +++ b/packweb-apache/tasks/apache.yml @@ -43,7 +43,7 @@ owner: root group: root mode: "0644" - force: no + force: false - name: Copy Apache settings for modules ansible.builtin.template: @@ -52,7 +52,7 @@ owner: root group: root mode: "0644" - force: no + force: false - name: Ensure Apache modules configs are enabled ansible.builtin.command: diff --git a/packweb-apache/tasks/awstats.yml b/packweb-apache/tasks/awstats.yml index 08c94381..f6e8b309 100644 --- a/packweb-apache/tasks/awstats.yml +++ b/packweb-apache/tasks/awstats.yml @@ -31,7 +31,7 @@ Require all granted - force: no + force: false mode: "0644" - name: Enable apache awstats-icon configuration diff --git a/packweb-apache/tasks/phpmyadmin.yml b/packweb-apache/tasks/phpmyadmin.yml index 11832300..abb1c552 100644 --- a/packweb-apache/tasks/phpmyadmin.yml +++ b/packweb-apache/tasks/phpmyadmin.yml @@ -15,7 +15,7 @@ ansible.builtin.template: src: phpmyadmin_apt_preferences.j2 dest: /etc/apt/preferences.d/999-phpmyadmin - force: yes + force: true mode: "0644" when: ansible_distribution_major_version is version('10', '=') @@ -53,7 +53,7 @@ dest: "{{ packweb_phpmyadmin_suffix_file }}" # The last character "\u000A" is a line feed (LF), it's better to keep it content: "{{ packweb_phpmyadmin_suffix }}\u000A" - force: yes + force: true when: packweb_phpmyadmin_suffix | length > 0 - name: generate random string for phpmyadmin suffix diff --git a/percona/tasks/main.yml b/percona/tasks/main.yml index 32637df7..069956d0 100644 --- a/percona/tasks/main.yml +++ b/percona/tasks/main.yml @@ -19,7 +19,7 @@ ansible.builtin.copy: src: percona.asc dest: "{{ apt_keyring_dir }}/percona.asc" - force: yes + force: true mode: "0644" owner: root group: root diff --git a/php/tasks/config_apache.yml b/php/tasks/config_apache.yml index 4ddc8448..addab08c 100644 --- a/php/tasks/config_apache.yml +++ b/php/tasks/config_apache.yml @@ -33,7 +33,7 @@ ; Put customized values here. ; default_charset = "ISO-8859-1" mode: "0644" - force: no + force: false - name: "Set custom values for PHP to enable Symfony" community.general.ini_file: diff --git a/php/tasks/config_cli.yml b/php/tasks/config_cli.yml index 506a1077..e7084d9b 100644 --- a/php/tasks/config_cli.yml +++ b/php/tasks/config_cli.yml @@ -17,10 +17,10 @@ dest: "{{ php_cli_custom_ini_file }}" content: | ; Put customized values here. - force: no + force: false # This task is not merged with the above copy -# because "force: no" prevents any fix after the fact +# because "force: false" prevents any fix after the fact - name: "Permissions for custom php.ini for CLI" ansible.builtin.file: dest: "{{ php_cli_custom_ini_file }}" diff --git a/php/tasks/config_fpm.yml b/php/tasks/config_fpm.yml index 9fc1cc33..836559bf 100644 --- a/php/tasks/config_fpm.yml +++ b/php/tasks/config_fpm.yml @@ -32,7 +32,7 @@ dest: "{{ php_fpm_custom_ini_file }}" content: | ; Put customized values here. - force: no + force: false notify: "restart {{ php_fpm_service_name }}" - name: Set default PHP FPM values @@ -66,7 +66,7 @@ ; Put customized values here. ; default_charset = "ISO-8859-1" mode: "0644" - force: no + force: false notify: "restart {{ php_fpm_service_name }}" - name: "Set custom values for PHP to enable Symfony" diff --git a/php/tasks/sury_post.yml b/php/tasks/sury_post.yml index ef4d3c7e..d529ec53 100644 --- a/php/tasks/sury_post.yml +++ b/php/tasks/sury_post.yml @@ -4,7 +4,7 @@ ansible.builtin.file: src: "{{ item.src }}" dest: "{{ item.dest }}" - force: yes + force: true state: link loop: - { src: "{{ php_cli_defaults_ini_file }}", dest: "/etc/php/7.4/cli/conf.d/z-evolinux-defaults.ini" } @@ -19,7 +19,7 @@ ansible.builtin.file: src: "{{ item.src }}" dest: "{{ item.dest }}" - force: yes + force: true state: link loop: - { src: "{{ php_apache_defaults_ini_file }}", dest: "/etc/php/7.4/apache2/conf.d/z-evolinux-defaults.ini" } @@ -36,7 +36,7 @@ ansible.builtin.file: src: "{{ item.src }}" dest: "{{ item.dest }}" - force: yes + force: true state: link loop: - { src: "{{ php_fpm_defaults_ini_file }}", dest: "/etc/php/7.4/fpm/conf.d/z-evolinux-defaults.ini" } diff --git a/postfix/tasks/minimal.yml b/postfix/tasks/minimal.yml index f8ea1b0b..36327b3e 100644 --- a/postfix/tasks/minimal.yml +++ b/postfix/tasks/minimal.yml @@ -13,7 +13,7 @@ owner: root group: root mode: "0644" - force: yes + force: true notify: restart postfix when: (postfix_force_main_cf | bool) or (postfix_maincf_md5_jessie in default_main_cf.stdout) or (postfix_maincf_md5_stretch in default_main_cf.stdout) tags: diff --git a/postfix/tasks/packmail.yml b/postfix/tasks/packmail.yml index be0b075e..f5ccf66d 100644 --- a/postfix/tasks/packmail.yml +++ b/postfix/tasks/packmail.yml @@ -31,7 +31,7 @@ owner: root group: root mode: "0644" - force: yes + force: true notify: restart postfix when: (postfix_force_main_cf | bool) or (postfix_maincf_md5_jessie in default_main_cf.stdout) or (postfix_maincf_md5_stretch in default_main_cf.stdout) tags: @@ -50,7 +50,7 @@ ansible.builtin.copy: src: filter dest: "/etc/postfix/{{ item }}" - force: no + force: false loop: - virtual - client.access diff --git a/postgresql/tasks/config.yml b/postgresql/tasks/config.yml index 87091b8f..2f735df0 100644 --- a/postgresql/tasks/config.yml +++ b/postgresql/tasks/config.yml @@ -9,7 +9,7 @@ ansible.builtin.copy: src: postgresql.service.override.conf dest: /etc/systemd/system/postgresql@.service.d/override.conf - force: yes + force: true mode: "0644" notify: - reload systemd diff --git a/postgresql/tasks/logrotate.yml b/postgresql/tasks/logrotate.yml index 55adc5bd..dbe66bb8 100644 --- a/postgresql/tasks/logrotate.yml +++ b/postgresql/tasks/logrotate.yml @@ -3,4 +3,4 @@ ansible.builtin.copy: src: logrotate_postgresql dest: /etc/logrotate.d/postgresql-common - force: no + force: false diff --git a/postgresql/tasks/pgdg-repo.yml b/postgresql/tasks/pgdg-repo.yml index e9f25307..b988618a 100644 --- a/postgresql/tasks/pgdg-repo.yml +++ b/postgresql/tasks/pgdg-repo.yml @@ -12,7 +12,7 @@ ansible.builtin.copy: src: postgresql.asc dest: "{{ apt_keyring_dir }}/postgresql.asc" - force: yes + force: true mode: "0644" owner: root group: root diff --git a/proftpd/tasks/main.yml b/proftpd/tasks/main.yml index ce292ad5..26dcfb85 100644 --- a/proftpd/tasks/main.yml +++ b/proftpd/tasks/main.yml @@ -76,7 +76,7 @@ ansible.builtin.copy: src: vpasswd dest: /etc/proftpd/vpasswd - force: no + force: false notify: restart proftpd tags: - proftpd diff --git a/rabbitmq/tasks/main.yml b/rabbitmq/tasks/main.yml index f485bc1f..d78c70fd 100644 --- a/rabbitmq/tasks/main.yml +++ b/rabbitmq/tasks/main.yml @@ -10,7 +10,7 @@ owner: rabbitmq group: rabbitmq mode: "0600" - force: no + force: false - name: Create rabbitmq.config ansible.builtin.copy: @@ -19,7 +19,7 @@ owner: rabbitmq group: rabbitmq mode: "0600" - force: no + force: false - name: Adjust ulimit ansible.builtin.lineinfile: diff --git a/rabbitmq/tasks/nrpe.yml b/rabbitmq/tasks/nrpe.yml index f491a68c..d181b07c 100644 --- a/rabbitmq/tasks/nrpe.yml +++ b/rabbitmq/tasks/nrpe.yml @@ -23,7 +23,7 @@ owner: root group: root mode: "0755" - force: yes + force: true when: ansible_distribution_major_version is version('11', '<=') - name: check_rabbitmq (Python 3 version) is installed @@ -33,7 +33,7 @@ owner: root group: root mode: "0755" - force: yes + force: true when: ansible_distribution_major_version is version('11', '>=') - name: check_rabbitmq is available for NRPE diff --git a/rbenv/tasks/main.yml b/rbenv/tasks/main.yml index 4362c5db..000eb163 100644 --- a/rbenv/tasks/main.yml +++ b/rbenv/tasks/main.yml @@ -33,7 +33,7 @@ dest: '{{ rbenv_root }}' version: '{{ rbenv_version }}' accept_hostkey: yes - force: yes + force: true become_user: "{{ username }}" become: yes tags: @@ -67,7 +67,7 @@ dest: '{{ rbenv_root }}/plugins/{{ item.name }}' version: '{{ item.version }}' accept_hostkey: yes - force: yes + force: true loop: "{{ rbenv_plugins }}" become_user: "{{ username }}" become: yes diff --git a/redis/tasks/nrpe.yml b/redis/tasks/nrpe.yml index 61400b99..a786c78f 100644 --- a/redis/tasks/nrpe.yml +++ b/redis/tasks/nrpe.yml @@ -12,7 +12,7 @@ ansible.builtin.copy: src: check_redis.pl dest: /usr/local/lib/nagios/plugins/check_redis - force: yes + force: true mode: "0755" owner: root group: root @@ -87,7 +87,7 @@ ansible.builtin.copy: src: check_redis_instances.sh dest: /usr/local/lib/nagios/plugins/check_redis_instances - force: yes + force: true mode: "0755" owner: root group: root diff --git a/squid/tasks/logrotate_jessie.yml b/squid/tasks/logrotate_jessie.yml index 345cd053..a0cfdff1 100644 --- a/squid/tasks/logrotate_jessie.yml +++ b/squid/tasks/logrotate_jessie.yml @@ -24,7 +24,7 @@ ansible.builtin.template: src: logrotate_jessie.j2 dest: /etc/logrotate.d/{{ squid_daemon_name }} - force: yes + force: true when: squid_logrotate_md5.rc == 0 tags: - squid diff --git a/squid/tasks/logrotate_stretch.yml b/squid/tasks/logrotate_stretch.yml index df264068..965256d4 100644 --- a/squid/tasks/logrotate_stretch.yml +++ b/squid/tasks/logrotate_stretch.yml @@ -24,7 +24,7 @@ ansible.builtin.template: src: logrotate_stretch.j2 dest: /etc/logrotate.d/{{ squid_daemon_name }} - force: yes + force: true when: squid_logrotate_md5.rc == 0 tags: - squid diff --git a/squid/tasks/main.yml b/squid/tasks/main.yml index 0a200188..2f0e94aa 100644 --- a/squid/tasks/main.yml +++ b/squid/tasks/main.yml @@ -46,7 +46,7 @@ ansible.builtin.copy: src: whitelist-evolinux.conf dest: /etc/squid3/whitelist.conf - force: no + force: false notify: "reload squid3" when: ansible_distribution_release == "jessie" @@ -69,14 +69,14 @@ dest: /etc/squid/evolinux-whitelist-custom.conf content: | # Put customized values here. - force: no + force: false when: ansible_distribution_major_version is version('9', '>=') - name: "evolinux acl for local proxy (Debian 9 or later)" ansible.builtin.template: src: evolinux-acl.conf.j2 dest: /etc/squid/evolinux-acl.conf - force: no + force: false notify: "reload squid" when: - squid_localproxy_enable | bool @@ -87,7 +87,7 @@ dest: /etc/squid/evolinux-acl.conf content: | # Put customized values here. - force: no + force: false when: - not (squid_localproxy_enable | bool) - ansible_distribution_major_version is version('9', '>=') @@ -96,7 +96,7 @@ ansible.builtin.copy: src: evolinux-httpaccess.conf dest: /etc/squid/evolinux-httpaccess.conf - force: no + force: false notify: "reload squid" when: - squid_localproxy_enable | bool @@ -107,7 +107,7 @@ dest: /etc/squid/evolinux-httpaccess.conf content: | # Put customized values here. - force: no + force: false when: - not (squid_localproxy_enable | bool) - ansible_distribution_major_version is version('9', '>=') @@ -116,7 +116,7 @@ ansible.builtin.template: src: evolinux-custom.conf.j2 dest: /etc/squid/evolinux-custom.conf - force: no + force: false notify: "reload squid" when: - squid_localproxy_enable | bool @@ -127,7 +127,7 @@ dest: /etc/squid/evolinux-custom.conf content: | # Put customized values here. - force: no + force: false when: - not (squid_localproxy_enable | bool) - ansible_distribution_major_version is version('9', '>=') diff --git a/squid/tasks/systemd.yml b/squid/tasks/systemd.yml index 7e262f23..da07eb81 100644 --- a/squid/tasks/systemd.yml +++ b/squid/tasks/systemd.yml @@ -21,7 +21,7 @@ src: systemd-override.conf.j2 dest: /etc/systemd/system/squid.service.d/override.conf mode: "0644" - force: yes + force: true register: _squid_systemd_override - name: "Systemd daemon is reloaded and Squid restarted" diff --git a/supervisord/tasks/main.yml b/supervisord/tasks/main.yml index 7b61ccbb..8d30c649 100644 --- a/supervisord/tasks/main.yml +++ b/supervisord/tasks/main.yml @@ -10,7 +10,7 @@ src: http.conf dest: /etc/supervisor/conf.d/ mode: "0644" - force: no + force: false notify: restart supervisor when: supervisord_enable_http | bool tags: diff --git a/tomcat-instance/tasks/bootstrap.yml b/tomcat-instance/tasks/bootstrap.yml index 818ddceb..c53a4a14 100644 --- a/tomcat-instance/tasks/bootstrap.yml +++ b/tomcat-instance/tasks/bootstrap.yml @@ -21,7 +21,7 @@ mode: "0660" owner: "{{ tomcat_instance_name }}" group: "{{ tomcat_instance_name }}" - force: no + force: false - name: Templating of server.xml file ansible.builtin.template: @@ -30,7 +30,7 @@ mode: "0660" owner: "{{ tomcat_instance_name }}" group: "{{ tomcat_instance_name }}" - force: no + force: false - name: Copy config file ansible.builtin.copy: @@ -39,6 +39,6 @@ mode: "0660" owner: "{{ tomcat_instance_name }}" group: "{{ tomcat_instance_name }}" - force: no + force: false with_fileglob: - "tomcat{{ tomcat_version }}/*" diff --git a/unbound/tasks/main.yml b/unbound/tasks/main.yml index 6e76eb3b..976c6386 100644 --- a/unbound/tasks/main.yml +++ b/unbound/tasks/main.yml @@ -11,7 +11,7 @@ ansible.builtin.get_url: url: https://www.internic.net/domain/named.cache dest: /etc/unbound/root.hints - force: yes + force: true mode: "0644" notify: reload unbound tags: diff --git a/varnish/tasks/main.yml b/varnish/tasks/main.yml index 585688b9..68f3fc74 100644 --- a/varnish/tasks/main.yml +++ b/varnish/tasks/main.yml @@ -80,7 +80,7 @@ when: - varnish_package_facts['version'] is version('4', '>=') - varnish_package_facts['version'] is version('6', '<') - - varnish_systemd_override_template | length == 0 + - varnish_systemd_override_template is none or varnish_systemd_override_template | length == 0 tags: - varnish - config @@ -92,7 +92,7 @@ when: - varnish_package_facts['version'] is version('6', '>=') - varnish_package_facts['version'] is version('7', '<') - - varnish_systemd_override_template | length == 0 + - varnish_systemd_override_template is none or varnish_systemd_override_template | length == 0 tags: - varnish - config @@ -103,7 +103,7 @@ varnish_systemd_override_template: override.conf.varnish7.j2 when: - varnish_package_facts['version'] is version('7', '>=') - - varnish_systemd_override_template | length == 0 + - varnish_systemd_override_template is none or varnish_systemd_override_template | length == 0 tags: - varnish - config @@ -113,7 +113,7 @@ ansible.builtin.template: src: "{{ varnish_systemd_override_template }}" dest: /etc/systemd/system/varnish.service.d/override.conf - force: yes + force: true notify: - reload systemd - restart varnish @@ -139,7 +139,7 @@ src: "{{ item }}" dest: "{{ varnish_config_file }}" mode: "0644" - force: yes + force: true when: varnish_update_config | bool loop: "{{ query('first_found', templates) }}" vars: @@ -172,7 +172,7 @@ ansible.builtin.template: src: "{{ item }}" dest: /etc/varnish/conf.d/ - force: yes + force: true mode: "0644" with_fileglob: - "templates/varnish/conf.d/*.vcl" diff --git a/vrrpd/tasks/ip.yml b/vrrpd/tasks/ip.yml index 87a05092..b46a8954 100644 --- a/vrrpd/tasks/ip.yml +++ b/vrrpd/tasks/ip.yml @@ -8,7 +8,7 @@ ansible.builtin.template: src: vrrp.service.j2 dest: "/etc/systemd/system/{{ vrrp_systemd_unit_name }}" - force: yes + force: true register: vrrp_systemd_unit - name: enable and start systemd unit diff --git a/webapps/nextcloud/tasks/archive.yml b/webapps/nextcloud/tasks/archive.yml index 47defe79..f4e1cf26 100644 --- a/webapps/nextcloud/tasks/archive.yml +++ b/webapps/nextcloud/tasks/archive.yml @@ -4,7 +4,7 @@ ansible.builtin.get_url: url: "{{ nextcloud_releases_baseurl }}{{ nextcloud_archive_name }}" dest: "{{ nextcloud_home }}/{{ nextcloud_archive_name }}" - force: no + force: false tags: - nextcloud @@ -12,7 +12,7 @@ ansible.builtin.get_url: url: "{{ nextcloud_releases_baseurl }}{{ nextcloud_archive_name }}.sha256" dest: "{{ nextcloud_home }}/{{ nextcloud_archive_name }}.sha256" - force: no + force: false tags: - nextcloud