fix issues found by ansible-lint

nsv777 · Dec 14, 2023 · eaff092 · eaff092
1 parent a80f509
commit eaff092
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/playbooks/arch_on_dell.yml b/playbooks/arch_on_dell.yml
@@ -4,7 +4,7 @@
   roles:
     - role: locale
       vars:
-        locale: pl_PL.UTF-8
+        locale_locale: pl_PL.UTF-8
     - role: configure_pacman
     - role: systemd
     - role: usb_mouse_on_boot

diff --git a/playbooks/roles/configure_pacman/tasks/main.yml b/playbooks/roles/configure_pacman/tasks/main.yml
@@ -2,8 +2,8 @@
 - name: Enable Spain mirror in /etc/pacman.d/mirrorlist
   ansible.builtin.replace:
     path: /etc/pacman.d/mirrorlist
-    regexp: '^#Server = http:\/\/mirror.librelabucm.org\/archlinux\/\$repo\/os\/\$arch'
-    replace: Server = http://mirror.librelabucm.org/archlinux/$repo/os/$arch
+    regexp: '^#Server = https:\/\/mirror.librelabucm.org\/archlinux\/\$repo\/os\/\$arch'
+    replace: Server = https://mirror.librelabucm.org/archlinux/$repo/os/$arch
   become: true
   notify: update_pacman_cache
   tags:

diff --git a/playbooks/roles/locale/defaults/main.yml b/playbooks/roles/locale/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-locale: en_US.UTF-8
+locale_locale: en_US.UTF-8
diff --git a/playbooks/roles/locale/tasks/main.yml b/playbooks/roles/locale/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
-- name: "/etc/locale.gen: uncomment locale {{ locale }}"
+- name: "/etc/locale.gen: uncomment locale {{ locale_locale }}"
   ansible.builtin.replace:
     dest: /etc/locale.gen
-    regexp: '^#{{ locale }} UTF-8.*$'
-    replace: '{{ locale }} UTF-8'
+    regexp: '^#{{ locale_locale }} UTF-8.*$'
+    replace: '{{ locale_locale }} UTF-8'
   become: true
   notify: generate_locales
   tags:
@@ -14,8 +14,8 @@
   ansible.builtin.meta: flush_handlers
 
 
-- name: "Setting locale to {{ locale }}"
-  ansible.builtin.command: 'localectl set-locale LANG="{{ locale }}"'
+- name: "Setting locale to {{ locale_locale }}"
+  ansible.builtin.command: 'localectl set-locale LANG="{{ locale_locale }}"'
   changed_when: false
   become: true
   tags:

diff --git a/playbooks/roles/systemd/defaults/main.yml b/playbooks/roles/systemd/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-conf_d_path: /etc/systemd/journald.conf.d
+systemd_journald_conf_d_path: /etc/systemd/journald.conf.d
diff --git a/playbooks/roles/systemd/tasks/main.yml b/playbooks/roles/systemd/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Create conf.d directory
   ansible.builtin.file:
-    path: "{{ conf_d_path }}"
+    path: "{{ systemd_journald_conf_d_path }}"
     state: directory
     mode: "0755"
   become: true
@@ -13,7 +13,7 @@
 - name: Copy journald config
   ansible.builtin.copy:
     src: "{{ item }}"
-    dest: "{{ conf_d_path }}"
+    dest: "{{ systemd_journald_conf_d_path }}"
     mode: "0644"
   with_fileglob:
     - files/*