diff --git a/roles/base/handlers/main.yml b/roles/base/handlers/main.yml index 6ee3975..ad2c3c2 100644 --- a/roles/base/handlers/main.yml +++ b/roles/base/handlers/main.yml @@ -1,6 +1,6 @@ --- - name: newaliases - shell: smtpctl update table aliases + command: smtpctl update table aliases - name: remount / noatime command: mount -u -o noatime / diff --git a/roles/base/tasks/cron.yml b/roles/base/tasks/cron.yml index 4cceb69..635182f 100644 --- a/roles/base/tasks/cron.yml +++ b/roles/base/tasks/cron.yml @@ -5,4 +5,4 @@ env: true value: "{{ cron_root_path }}" tags: - - cron \ No newline at end of file + - cron diff --git a/roles/base/tasks/dotfiles.yml b/roles/base/tasks/dotfiles.yml index eb8c144..551d5ab 100644 --- a/roles/base/tasks/dotfiles.yml +++ b/roles/base/tasks/dotfiles.yml @@ -3,6 +3,7 @@ template: src: profile.j2 dest: /root/.profile + mode: "0644" tags: - admin - dotfiles @@ -21,6 +22,7 @@ copy: src: kshrc dest: /root/.kshrc + mode: "0644" tags: - admin - dotfiles @@ -29,6 +31,7 @@ template: src: profile.j2 dest: /etc/skel/.profile + mode: "0644" tags: - admin - dotfiles @@ -37,6 +40,7 @@ lineinfile: state: present dest: /etc/skel/.profile + mode: "0644" insertafter: EOF line: 'trap "doas /usr/share/scripts/evomaintenance.sh" 0' create: true @@ -58,6 +62,7 @@ copy: src: kshrc dest: /etc/skel/.kshrc + mode: "0644" tags: - admin - dotfiles diff --git a/roles/base/tasks/mail.yml b/roles/base/tasks/mail.yml index c15d4d9..fc36a64 100644 --- a/roles/base/tasks/mail.yml +++ b/roles/base/tasks/mail.yml @@ -14,6 +14,7 @@ line: 'date | mail -s "boot/reboot of $(hostname -s)" {{ general_alert_email }}' insertbefore: 'echo' + mode: "0640" create: true when: - not (rclocal_content.stdout diff --git a/roles/base/tasks/newsyslog.yml b/roles/base/tasks/newsyslog.yml index 936a6d5..e21bf0a 100644 --- a/roles/base/tasks/newsyslog.yml +++ b/roles/base/tasks/newsyslog.yml @@ -3,5 +3,6 @@ copy: src: newsyslog.conf dest: /etc/newsyslog.conf + mode: "0644" tags: - newsyslog diff --git a/roles/base/tasks/ntp.yml b/roles/base/tasks/ntp.yml index c9d92f6..b98a26f 100644 --- a/roles/base/tasks/ntp.yml +++ b/roles/base/tasks/ntp.yml @@ -3,8 +3,8 @@ command: cat ntpd.conf args: chdir: /etc/ - check_mode: no - changed_when: no + check_mode: false + changed_when: false register: ntpd_conf tags: - ntp @@ -21,7 +21,7 @@ lineinfile: path: /etc/ntpd.conf line: "server {{ ntpd_servers }}" - create: yes + create: true owner: root group: wheel mode: '0644' diff --git a/roles/base/tasks/packages.yml b/roles/base/tasks/packages.yml index 5bbe520..fbf10a9 100644 --- a/roles/base/tasks/packages.yml +++ b/roles/base/tasks/packages.yml @@ -4,6 +4,7 @@ copy: dest: /etc/installurl src: installurl + mode: "0644" tags: - pkg diff --git a/roles/base/tasks/utils.yml b/roles/base/tasks/utils.yml index f1ed300..4a5a6fd 100644 --- a/roles/base/tasks/utils.yml +++ b/roles/base/tasks/utils.yml @@ -3,7 +3,7 @@ copy: src: "dump-server-state.sh" dest: /usr/local/sbin/dump-server-state - force: True + force: true owner: root group: wheel mode: "0750" diff --git a/roles/etc-git/tasks/commit.yml b/roles/etc-git/tasks/commit.yml index 929239f..b388d5e 100644 --- a/roles/etc-git/tasks/commit.yml +++ b/roles/etc-git/tasks/commit.yml @@ -33,3 +33,4 @@ when: - _usr_share_scripts_git.stat.exists - _usr_share_scripts_git.stat.isdir + diff --git a/roles/etc-git/tasks/main.yml b/roles/etc-git/tasks/main.yml index 851992a..9c3d308 100644 --- a/roles/etc-git/tasks/main.yml +++ b/roles/etc-git/tasks/main.yml @@ -12,7 +12,7 @@ src: evocommit dest: /usr/local/bin/evocommit mode: "0755" - force: yes + force: true tags: - etc-git @@ -42,7 +42,7 @@ src: etc-git-optimize dest: /usr/share/scripts/etc-git-optimize mode: "0755" - force: yes + force: true tags: - etc-git @@ -51,7 +51,7 @@ src: etc-git-status dest: /usr/share/scripts/etc-git-status mode: "0755" - force: yes + force: true tags: - etc-git @@ -147,7 +147,7 @@ insertbefore: "/usr/share/scripts/etc-git-status" owner: root mode: "0644" - create: true + create: true state: "{{ etc_git_monitor_status | bool | ternary('present','absent') }}" tags: - etc-git diff --git a/roles/evocheck/tasks/exec.yml b/roles/evocheck/tasks/exec.yml index d7f9ac6..f5f70fa 100644 --- a/roles/evocheck/tasks/exec.yml +++ b/roles/evocheck/tasks/exec.yml @@ -10,6 +10,6 @@ - debug: var: evocheck_run.stdout_lines - when: evocheck_run.stdout != "" + when: evocheck_run.stdout | length != 0 tags: - evocheck-exec diff --git a/roles/evocheck/tasks/main.yml b/roles/evocheck/tasks/main.yml index 1572d6f..c0da5d1 100644 --- a/roles/evocheck/tasks/main.yml +++ b/roles/evocheck/tasks/main.yml @@ -23,6 +23,7 @@ copy: src: evocheck.cf dest: /etc/evocheck.cf + mode: "0644" force: false tags: - evocheck diff --git a/roles/nagios-nrpe/tasks/main.yml b/roles/nagios-nrpe/tasks/main.yml index 3d5ec1d..3870a0d 100644 --- a/roles/nagios-nrpe/tasks/main.yml +++ b/roles/nagios-nrpe/tasks/main.yml @@ -29,6 +29,7 @@ template: src: evolix_bsd.cfg.j2 dest: /etc/nrpe.d/evolix.cfg + mode: "0644" notify: restart nrpe - name: Create nrpe plugins dir diff --git a/roles/post-install/tasks/ldif.yml b/roles/post-install/tasks/ldif.yml index 09e65eb..c0bd8c6 100644 --- a/roles/post-install/tasks/ldif.yml +++ b/roles/post-install/tasks/ldif.yml @@ -10,9 +10,9 @@ - name: run generateldif command: '{{ general_scripts_dir }}/generateldif.sh' register: generateldif_run - changed_when: False - failed_when: False - check_mode: no + changed_when: false + failed_when: false + check_mode: false tags: - generateldif-exec diff --git a/roles/post-install/tasks/update.yml b/roles/post-install/tasks/update.yml index 8ec4587..a0389e7 100644 --- a/roles/post-install/tasks/update.yml +++ b/roles/post-install/tasks/update.yml @@ -1,4 +1,4 @@ --- - name: Check and install updates (erratas) if available - shell: /usr/sbin/syspatch + command: /usr/sbin/syspatch when: ansible_distribution_version is version_compare("6.1",'>=')