Simplify var names in apps role

group_vars/all/apps.yml

@@ -2,6 +2,7 @@
 dnf_remove_repos:
   - google-chrome
 
+
 dnf_remove:
   - abrt
   - anaconda-live
@@ -33,11 +34,10 @@ apps:
   - mullvad-vpn
   - nautilus-python
   - pinta
-  - profile-sync-daemon
   - python3-virtualenv
   - python3-virtualenvwrapper
   - remmina
-  - rpmfusion-free-release
+  - https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_facts['distribution_major_version'] }}.noarch.rpm
   - setroubleshoot
   - ShellCheck
   - snapd

group_vars/laptop/apps.yml

@@ -0,0 +1,2 @@
+apps_group:
+  - profile-sync-daemon

group_vars/workstation/apps.yml

@@ -0,0 +1,3 @@
+apps_group:
+  -
+  # - profile-sync-daemon

roles/apps/aichat.yml

@@ -1,4 +1,4 @@
-cargo_packages_app:
+cargo:
   - aichat
 
 configs:

roles/apps/btrbk.yml

@@ -1,4 +1,4 @@
-services:
+system_services:
   - btrbk.timer
 
 configs:

roles/apps/btrfsmaintenance.yml

@@ -1,4 +1,4 @@
-services:
+system_services:
   - btrfs-balance.timer
   - btrfs-scrub.timer
   - btrfs-trim.timer

roles/apps/code.yml

@@ -1,4 +1,4 @@
-dnf_add_repos_app:
+repos:
   - name: code
     description: Visual Studio Code
     baseurl: https://packages.microsoft.com/yumrepos/vscode

roles/apps/dnf-automatic.yml

@@ -1,2 +1,2 @@
-services:
+system_services:
   - dnf-automatic.timer

roles/apps/keyd.yml

@@ -1,7 +1,7 @@
-dnf_add_copr_app:
+copr:
   - alternateved/keyd
 
-services:
+system_services:
   - keyd
 
 configs:

roles/apps/mediacenter35.yml

@@ -1,4 +1,4 @@
-dnf_add_repos_app:
+repos:
   - name: jriver
     description: JRiver Media Center by BryanC
     baseurl: https://repos.bryanroessler.com/jriver

roles/apps/mullvad-vpn.yml

@@ -1,3 +1,3 @@
-dnf_add_repofiles_app:
+repofiles:
   - name: Mullvad VPN
     url: https://repository.mullvad.net/rpm/stable/mullvad.repo

roles/apps/profile-sync-daemon.yml

@@ -1,2 +1,2 @@
-services:
+user_services:
   - psd.service

roles/apps/pwrstatd.yml

@@ -1,7 +1,7 @@
-apps_app:
+packages:
   - "https://dl4jz3rbrsfum.cloudfront.net/software/PPL_64bit_v1.4.1.rpm"
 
-services:
+system_services:
   - pwrstatd.service
 
 configs:

roles/apps/tailscale.yml

@@ -1,2 +1,2 @@
-services:
+system_services:
   - tailscaled.service

roles/apps/tasks/main.yml

@@ -1,20 +1,41 @@
 ---
+- name: Load per-app configuration files
+  ansible.builtin.include_vars:
+    file: "{{ role_path }}/{{ item }}.yml"
+    name: "app_{{ item }}"
+  loop: "{{ ((apps | default([])) + (apps_group | default([]))) | select | list }}"
+  failed_when: false
+
+- name: Merge app configuration
+  ansible.builtin.set_fact:
+    apps_copr: "{{ apps_copr | default([]) + (lookup('vars', 'app_' + item, default={}).copr | default([])) }}"
+    apps_repos: "{{ apps_repos | default([]) + (lookup('vars', 'app_' + item, default={}).repos | default([])) }}"
+    apps_repofiles: "{{ apps_repofiles | default([]) + (lookup('vars', 'app_' + item, default={}).repofiles | default([])) }}"
+    apps_packages: "{{ apps_packages | default([]) + (lookup('vars', 'app_' + item, default={}).packages | default([])) }}"
+    apps_cargo: "{{ apps_cargo | default([]) + (lookup('vars', 'app_' + item, default={}).cargo | default([])) }}"
+    apps_system_services: "{{ apps_system_services | default([]) + (lookup('vars', 'app_' + item, default={}).system_services | default([])) }}"
+    apps_user_services: "{{ apps_user_services | default([]) + (lookup('vars', 'app_' + item, default={}).user_services | default([])) }}"
+  loop: "{{ ((apps | default([])) + (apps_group | default([]))) | select | list }}"
+
 - name: Enable COPR repositories
   community.general.copr:
     name: "{{ item.repo | default(item) }}"
     state: enabled
-  loop: "{{ (dnf_add_copr | default([])) + (dnf_add_copr_group | default([])) + (dnf_add_copr_app | default([])) }}"
+  loop: "{{ apps_copr | default([]) }}"
   become: true
 
 - name: Add DNF repositories
   ansible.builtin.yum_repository:
     name: "{{ item.name }}"
     description: "{{ item.description | default(omit) }}"
-    baseurl: "{{ item.baseurl }}"
-    enabled: true
+    baseurl: "{{ item.baseurl | default(omit) }}"
+    metalink: "{{ item.metalink | default(omit) }}"
+    enabled: "{{ item.enabled | default(true) }}"
+    metadata_expire: "{{ item.metadata_expire | default(omit) }}"
     gpgcheck: "{{ item.gpgcheck | default(true) }}"
+    repo_gpgcheck: "{{ item.repo_gpgcheck | default(omit) }}"
     gpgkey: "{{ item.gpgkey | default(omit) }}"
-  loop: "{{ (dnf_add_repos | default([])) + (dnf_add_repos_group | default([])) + (dnf_add_repos_app | default([])) }}"
+  loop: "{{ (dnf_add_repos | default([])) + (apps_repos | default([])) }}"
   become: true
 
 - name: Add DNF repository files
@@ -24,7 +45,7 @@
     owner: root
     group: root
     mode: '0644'
-  loop: "{{ (dnf_add_repofiles | default([])) + (dnf_add_repofiles_group | default([])) + (dnf_add_repofiles_app | default([])) }}"
+  loop: "{{ apps_repofiles | default([]) }}"
   become: true
 
 - name: Remove DNF repositories
@@ -43,9 +64,17 @@
   become: true
   failed_when: false
 
+- name: Install remote RPM packages (from URLs)
+  ansible.builtin.dnf:
+    name: "{{ apps_packages | default([]) | select('match', '^https?://') | list }}"
+    state: present
+    disable_gpg_check: true
+  become: true
+  when: (apps_packages | default([]) | select('match', '^https?://') | list) | length > 0
+
 - name: Install DNF packages
   ansible.builtin.dnf:
-    name: "{{ (apps | default([])) + (apps_group | default([])) + (apps_app | default([])) }}"
+    name: "{{ ((apps | default([])) + (apps_group | default([])) + (apps_packages | default([]) | reject('match', '^https?://') | list)) | select | list }}"
     state: present
     skip_broken: true
   become: true
@@ -60,8 +89,7 @@
 - name: Install cargo packages
   ansible.builtin.command:
     cmd: "cargo install {{ item }}"
-  loop: "{{ (cargo_packages | default([])) + (cargo_packages_group | default([])) + (cargo_packages_app | default([])) }}"
-  when: ((cargo_packages | default([])) + (cargo_packages_group | default([])) + (cargo_packages_app | default([]))) | length > 0
+  loop: "{{ apps_cargo | default([]) }}"
   register: apps_cargo_install_result
   changed_when: "'Installing' in apps_cargo_install_result.stderr or 'Compiling' in apps_cargo_install_result.stderr"
   failed_when: apps_cargo_install_result.rc != 0 and 'already exists' not in apps_cargo_install_result.stderr
@@ -80,7 +108,7 @@
     enabled: true
     state: started
     scope: system
-  loop: "{{ (services_system_enabled | default([])) + (services_system_enabled_group | default([])) + (services_system_enabled_app | default([])) }}"
+  loop: "{{ (services_system_enabled | default([])) + (services_system_enabled_group | default([])) + (apps_system_services | default([])) }}"
   become: true
 
 - name: Disable and stop system services
@@ -89,7 +117,7 @@
     enabled: false
     state: stopped
     scope: system
-  loop: "{{ (services_system_disabled | default([])) + (services_system_disabled_group | default([])) + (services_system_disabled_app | default([])) }}"
+  loop: "{{ (services_system_disabled | default([])) + (services_system_disabled_group | default([])) }}"
   become: true
 
 - name: Enable and start user services
@@ -98,12 +126,12 @@
     enabled: true
     state: started
     scope: user
-  loop: "{{ (services_user_enabled | default([])) + (services_user_enabled_group | default([])) + (services_user_enabled_app | default([])) }}"
+  loop: "{{ (services_user_enabled | default([])) + (services_user_enabled_group | default([])) + (apps_user_services | default([])) }}"
 
 - name: Disable and stop user services
   ansible.builtin.systemd:
     name: "{{ item }}"
     enabled: false
     state: stopped
-    scope: system
-  loop: "{{ (services_user_disabled | default([])) + (services_user_disabled_group | default([])) + (services_user_disabled_app | default([])) }}"
+    scope: user
+  loop: "{{ (services_user_disabled | default([])) + (services_user_disabled_group | default([])) }}"

roles/apps/zsh-completions.yml

@@ -1,4 +1,4 @@
-dnf_add_repos_app:
+repos:
   - name: zsh-completions
     description: zsh-completions from openSUSE
     baseurl: https://download.opensuse.org/repositories/shells:zsh-users:zsh-completions/Fedora_Rawhide/