From 82a43f8921d07ab139a387862efb96d6efee96ce Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Fri, 21 Jul 2023 09:50:48 +0000 Subject: [PATCH] Fixes for ansible-lint --- cups/tasks/main.yml | 8 +++++--- firefox/tasks/main.yml | 4 ++-- git/tasks/main.yml | 4 ++-- google_chrome/tasks/main.yml | 8 ++++---- kerberos/tasks/main.yml | 2 +- ldap/tasks/main.yml | 4 ++-- lynx/tasks/main.yml | 4 ++-- mutt/tasks/main.yml | 4 ++-- powertools_repo/tasks/main.yml | 4 ++-- thunderbird/tasks/main.yml | 2 +- 10 files changed, 23 insertions(+), 21 deletions(-) diff --git a/cups/tasks/main.yml b/cups/tasks/main.yml index d2835f2..f94b0f9 100644 --- a/cups/tasks/main.yml +++ b/cups/tasks/main.yml @@ -3,9 +3,9 @@ ansible.builtin.shell: cmd: localectl status | grep -E '^\s+LC_PAPER=fi_FI.UTF-8$' register: locale_check + changed_when: false failed_when: false check_mode: false - changed_when: false - name: Set system paper size to A4 ansible.builtin.command: @@ -13,6 +13,8 @@ - localectl - set-locale - LC_PAPER=fi_FI.UTF-8 + register: result + changed_when: result.rc == 0 when: locale_check.rc != 0 - name: Install packages @@ -24,7 +26,7 @@ ansible.builtin.file: path: /etc/cups state: directory - mode: 0755 + mode: "0755" owner: root group: "{{ ansible_wheel }}" @@ -36,6 +38,6 @@ Encryption Required TrustOnFirstUse No ValidateCerts Yes - mode: 0644 + mode: "0644" owner: root group: "{{ ansible_wheel }}" diff --git a/firefox/tasks/main.yml b/firefox/tasks/main.yml index 84a58f0..96212a0 100644 --- a/firefox/tasks/main.yml +++ b/firefox/tasks/main.yml @@ -8,7 +8,7 @@ ansible.builtin.file: path: /usr/lib64/firefox/defaults/preferences state: directory - mode: 0755 + mode: "0755" owner: root group: "{{ ansible_wheel }}" @@ -16,6 +16,6 @@ ansible.builtin.copy: dest: /usr/lib64/firefox/defaults/preferences/00-foo.sh.js src: foo.sh.js - mode: 0644 + mode: "0644" owner: root group: "{{ ansible_wheel }}" diff --git a/git/tasks/main.yml b/git/tasks/main.yml index f485620..8cd2d6b 100644 --- a/git/tasks/main.yml +++ b/git/tasks/main.yml @@ -8,7 +8,7 @@ ansible.builtin.template: dest: /etc/profile.d/git.sh src: git.sh.j2 - mode: 0644 + mode: "0644" owner: root group: root @@ -16,6 +16,6 @@ ansible.builtin.template: dest: /etc/profile.d/git.csh src: git.csh.j2 - mode: 0644 + mode: "0644" owner: root group: root diff --git a/google_chrome/tasks/main.yml b/google_chrome/tasks/main.yml index 067438d..24648f4 100644 --- a/google_chrome/tasks/main.yml +++ b/google_chrome/tasks/main.yml @@ -17,7 +17,7 @@ ansible.builtin.file: path: "{{ item }}" state: directory - mode: 0755 + mode: "0755" owner: root group: root with_items: @@ -28,7 +28,7 @@ ansible.builtin.copy: dest: /etc/opt/chrome/policies/managed/foo.sh.json src: managed.json - mode: 0644 + mode: "0644" owner: root group: root @@ -36,7 +36,7 @@ ansible.builtin.copy: dest: /etc/opt/chrome/policies/recommended/foo.sh.json src: recommended.json - mode: 0644 + mode: "0644" owner: root group: root @@ -44,7 +44,7 @@ ansible.builtin.copy: dest: "/usr/local/bin/{{ item }}" src: "{{ item }}.sh" - mode: 0755 + mode: "0755" owner: root group: "{{ ansible_wheel }}" with_items: diff --git a/kerberos/tasks/main.yml b/kerberos/tasks/main.yml index 88cebd3..91bd354 100644 --- a/kerberos/tasks/main.yml +++ b/kerberos/tasks/main.yml @@ -8,6 +8,6 @@ ansible.builtin.template: dest: /etc/krb5.conf.d/realm.conf src: realm.conf.j2 - mode: 0644 + mode: "0644" owner: root group: "{{ ansible_wheel }}" diff --git a/ldap/tasks/main.yml b/ldap/tasks/main.yml index 2fee01c..10eaeab 100644 --- a/ldap/tasks/main.yml +++ b/ldap/tasks/main.yml @@ -8,7 +8,7 @@ ansible.builtin.template: dest: /etc/openldap/ldap.conf src: ldap.conf.j2 - mode: 0644 + mode: "0644" owner: root group: "{{ ansible_wheel }}" @@ -16,6 +16,6 @@ ansible.builtin.template: dest: /root/.ldaprc src: ldaprc.j2 - mode: 0600 + mode: "0600" owner: root group: "{{ ansible_wheel }}" diff --git a/lynx/tasks/main.yml b/lynx/tasks/main.yml index 67acbde..77fc73d 100644 --- a/lynx/tasks/main.yml +++ b/lynx/tasks/main.yml @@ -8,7 +8,7 @@ ansible.builtin.copy: dest: /etc/lynx-site.cfg src: lynx-site.cfg - mode: 0644 + mode: "0644" owner: root group: "{{ ansible_wheel }}" @@ -16,6 +16,6 @@ ansible.builtin.copy: dest: /usr/local/bin/html2text src: html2text.sh - mode: 0755 + mode: "0755" owner: root group: "{{ ansible_wheel }}" diff --git a/mutt/tasks/main.yml b/mutt/tasks/main.yml index e0777cb..f27e55b 100644 --- a/mutt/tasks/main.yml +++ b/mutt/tasks/main.yml @@ -8,7 +8,7 @@ ansible.builtin.template: dest: /etc/Muttrc.local src: Muttrc.local - mode: 0644 + mode: "0644" owner: root group: "{{ ansible_wheel }}" @@ -16,6 +16,6 @@ ansible.builtin.copy: dest: /usr/local/bin/mutt-folder src: mutt-folder.sh - mode: 0755 + mode: "0755" owner: root group: "{{ ansible_wheel }}" diff --git a/powertools_repo/tasks/main.yml b/powertools_repo/tasks/main.yml index d6985ca..265f1a8 100644 --- a/powertools_repo/tasks/main.yml +++ b/powertools_repo/tasks/main.yml @@ -6,7 +6,6 @@ - config-manager - --dump - powertools - warn: false changed_when: false register: result @@ -17,5 +16,6 @@ - config-manager - --set-enabled - powertools - warn: false + register: result + changed_when: result.rc == 0 when: "'enabled = 1' not in result.stdout_lines" diff --git a/thunderbird/tasks/main.yml b/thunderbird/tasks/main.yml index 58d628c..6692344 100644 --- a/thunderbird/tasks/main.yml +++ b/thunderbird/tasks/main.yml @@ -8,6 +8,6 @@ ansible.builtin.copy: dest: /usr/lib64/thunderbird/defaults/pref/00-foo.sh.js src: foo.sh.js - mode: 0644 + mode: "0644" owner: root group: "{{ ansible_wheel }}"