Group/host variable refactor

tasks/setup.yml

@@ -1,166 +1,183 @@
-- name: copy reflector configuration
+- name: Provision pollkit administrator configuration
   become: true
-  template:
+  ansible.builtin.template:
+    src: 'templates/polkit.j2'
+    dest: '/etc/polkit-1/rules.d/49-nopasswd_global.rules'
+    mode: '0755'
+
+- name: Install shared packages
+  become: true
+  community.general.pacman:
+    name: '{{ packages }}'
+
+- name: Copy reflector configuration
+  become: true
+  ansible.builtin.template:
     src: 'templates/reflector.j2'
     dest: '/etc/xdg/reflector/reflector.conf'
-    owner: root
-    group: root
     mode: '0600'
 
 # started by weekly timer
-- name: disable reflector
+- name: Disable reflector
   become: true
-  systemd:
+  ansible.builtin.systemd:
     name: reflector
     state: stopped
     enabled: false
 
-- name: copy pacman configuration
+- name: Copy pacman configuration
   become: true
-  template:
+  ansible.builtin.template:
     src: 'templates/pacman.j2'
     dest: '/etc/pacman.conf'
     owner: root
     group: root
     mode: '0644'
 
-- name: create extra conf
+- name: Create extra conf
   become: true
-  file:
+  ansible.builtin.file:
     path: '/etc/pacman.d/extra.conf'
     owner: root
     group: root
     state: touch
     mode: '0644'
 
-- name: create wezterm configuration dir
-  file:
+- name: Create wezterm configuration dir
+  ansible.builtin.file:
     path: '{{ xdg_config_dir }}/wezterm/includes'
     state: directory
+    mode: '0755'
 
-- name: copy wezterm configuration files
-  template:
+- name: Copy wezterm configuration files
+  ansible.builtin.template:
     src: '{{ item.src }}'
     dest: '{{ item.dest }}'
+    mode: '0755'
   loop:
-    - {
-        src: 'templates/wezterm/wezterm.lua.j2',
-        dest: '{{ xdg_config_dir }}/wezterm/wezterm.lua'
-    }
-    - {
-        src: 'templates/wezterm/includes/colors.lua.j2',
-        dest: '{{ xdg_config_dir }}/wezterm/includes/colors.lua'
-    }
-    - {
-        src: 'templates/wezterm/includes/fonts.lua.j2',
-        dest: '{{ xdg_config_dir }}/wezterm/includes/fonts.lua'
-    }
-    - {
-        src: 'templates/wezterm/includes/window.lua.j2',
-        dest: '{{ xdg_config_dir }}/wezterm/includes/window.lua'
-    }
+    - src: 'templates/wezterm/wezterm.lua.j2'
+      dest: '{{ xdg_config_dir }}/wezterm/wezterm.lua'
 
-- name: enable fstrim timer
+    - src: 'templates/wezterm/includes/colors.lua.j2'
+      dest: '{{ xdg_config_dir }}/wezterm/includes/colors.lua'
+
+    - src: 'templates/wezterm/includes/fonts.lua.j2'
+      dest: '{{ xdg_config_dir }}/wezterm/includes/fonts.lua'
+
+    - src: 'templates/wezterm/includes/window.lua.j2'
+      dest: '{{ xdg_config_dir }}/wezterm/includes/window.lua'
+
+- name: Enable fstrim timer
   become: true
-  systemd:
+  ansible.builtin.systemd:
     name: fstrim.timer
     enabled: true
 
-- name: remove the sysctl.d directory
+- name: Remove the sysctl.d directory
   become: true
-  file:
+  ansible.builtin.file:
     path: /etc/sysctl.d
     state: absent
 
-- name: recreate the sysctl.d directory
+- name: Recreate the sysctl.d directory
   become: true
-  file:
+  ansible.builtin.file:
     path: /etc/sysctl.d
     state: directory
-    mode: 755
+    mode: '0755'
 
-- name: copy sysctl files
+- name: Copy sysctl files
   become: true
-  template:
+  when: "'personal' not in group_names"
+  ansible.builtin.template:
     src: '{{ item.src }}'
     dest: '{{ item.dest }}'
+    mode: '0755'
   loop:
-    - {
-        src: 'templates/{{ platform }}/sysctl/99-sysrq.conf.j2',
-        dest: '/etc/sysctl.d/99-sysrq.conf'
-    }
-    - {
-        src: 'templates/{{ platform }}/sysctl/98-forward.conf.j2',
-        dest: '/etc/sysctl.d/98-foward.conf'
-    }
+    - src: 'templates/sysctl/99-sysrq.conf.j2'
+      dest: '/etc/sysctl.d/99-sysrq.conf'
+    - src: 'templates/sysctl/98-forward.conf.j2'
+      dest: '/etc/sysctl.d/98-foward.conf'
   notify: reload sysctl configuration
 
-- name: remove the modprobe.d directory
+- name: Remove the modprobe.d directory
   become: true
-  file:
+  ansible.builtin.file:
     path: /etc/modprobe.d
     state: absent
 
-- name: recreate the modprobe.d directory
+- name: Recreate the modprobe.d directory
   become: true
-  file:
+  ansible.builtin.file:
     path: /etc/modprobe.d
     state: directory
-    mode: 755
+    mode: '0755'
 
-- name: copy modprobe configuration files
+- name: Copy modprobe configuration files
   become: true
-  template:
+  ansible.builtin.template:
     src: '{{ item.src }}'
     dest: '{{ item.dest }}'
+    mode: '0755'
   loop: '{{ modprobe_templates }}'
   when: modprobe_templates
 
-- name: copy kernel parameters template
+- name: Copy kernel parameters template
   become: true
-  template:
-    src: 'templates/{{ platform }}/cmdline.j2'
+  when: "'personal' not in group_names"
+  ansible.builtin.template:
+    src: 'templates/{{ ansible_hostname }}/cmdline.j2'
     dest: '/etc/kernel/cmdline'
+    mode: '0755'
 
-- name: remove the mkinitcpio directories
+- name: Copy kernel parameters template for personal group
   become: true
-  file:
+  when: "'personal' in group_names"
+  ansible.builtin.template:
+    src: 'templates/personal/{{ ansible_hostname }}/cmdline.j2'
+    dest: '/etc/kernel/cmdline'
+    mode: '0755'
+
+- name: Remove the mkinitcpio directories
+  become: true
+  ansible.builtin.file:
     path: '{{ item }}'
     state: absent
   loop:
     - /etc/mkinitcpio.conf.d
     - /etc/mkinitcpio.d
 
-- name: recreate the mkinitcpio directories
+- name: Recreate the mkinitcpio directories
   become: true
-  file:
+  ansible.builtin.file:
     path: '{{ item }}'
     state: directory
-    mode: 755
+    mode: '0755'
   loop:
     - /etc/mkinitcpio.conf.d
     - /etc/mkinitcpio.d
 
-- name: copy mkinitcpio configuration files
+- name: Copy mkinitcpio configuration files
   become: true
-  template:
+  ansible.builtin.template:
     src: '{{ item.src }}'
     dest: '{{ item.dest }}'
+    mode: '0755'
   loop: '{{ mkinitcpio_templates }}'
   when: mkinitcpio_templates
 
-- name: regenerate initramfs images
+- name: Regenerate initramfs images
   become: true
-  command: 'mkinitcpio --allpresets'
+  ansible.builtin.command: 'mkinitcpio --allpresets'
   register: mkinitcpio_stats
 
-- name: log mkinitcpio stdout
-  debug:
+- name: Log mkinitcpio stdout
+  ansible.builtin.debug:
     var: mkinitcpio_stats.stdout_lines
 
-- name: create a Linux UEFI boot entry
+- name: Create a Linux UEFI boot entry
   become: true
-  command: efibootmgr \
+  ansible.builtin.command: efibootmgr \
     --create \
     --disk '{{ boot_configuration.disk }}' \
     --part '{{ boot_configuration.partition }}' \
@@ -171,14 +188,14 @@
   register: efi_linux_stats
   when: register_uefi_entries
 
-- name: log efibootmgr stdout
-  debug:
+- name: Log efibootmgr stdout
+  ansible.builtin.debug:
     var: efi_linux_stats.stdout_lines
   when: register_uefi_entries
 
-- name: create a Linux LTS UEFI boot entry
+- name: Create a Linux LTS UEFI boot entry
   become: true
-  command: efibootmgr \
+  ansible.builtin.command: efibootmgr \
     --create \
     --disk '{{ boot_configuration.disk }}' \
     --part '{{ boot_configuration.partition }}' \
@@ -189,7 +206,7 @@
   register: efi_linux_lts_stats
   when: register_uefi_entries
 
-- name: log efibootmgr LTS stdout
-  debug:
+- name: Log efibootmgr LTS stdout
+  ansible.builtin.debug:
     var: efi_linux_lts_stats.stdout_lines
   when: register_uefi_entries