From a50cc99839727fa5cedd6ee4cca658ec09e2132d Mon Sep 17 00:00:00 2001 From: Hyperling Date: Sun, 14 Feb 2021 07:22:29 -0600 Subject: [PATCH] Starting support for Arch/Manjaro. --- facts/general/package.yml | 7 +++++++ facts/general/system.yml | 11 ++--------- facts/workstation/package.yml | 8 ++++++++ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/facts/general/package.yml b/facts/general/package.yml index dd3dd37..17d0f18 100644 --- a/facts/general/package.yml +++ b/facts/general/package.yml @@ -7,6 +7,13 @@ sshfs: sshfs locate: locate when: ansible_pkg_mgr == "apt" + + +- name: General | Facts | Package | pacman + set_fact: + sshfs: sshfs + locate: mlocate + when: ansible_pkg_mgr == "pacman" - name: General | Facts | Package | FreeBSD diff --git a/facts/general/system.yml b/facts/general/system.yml index 93bbcc7..b73651d 100644 --- a/facts/general/system.yml +++ b/facts/general/system.yml @@ -1,18 +1,11 @@ --- # Define file, folder, and other facts per OS. -- name: General | Facts | System | Pop OS +- name: General | Facts | System | Linux set_fact: lynis_install_dir: /usr/local/lynis sudoers_install_dir: /etc/sudoers.d/ - when: ansible_distribution == "Pop!_OS" - - -- name: General | Facts | System | Debian and Ubuntu - set_fact: - lynis_install_dir: /usr/local/lynis - sudoers_install_dir: /etc/sudoers.d/ - when: ansible_distribution in ("Debian","Ubuntu") + when: ansible_system == "Linux" - name: General | Facts | System | FreeBSD diff --git a/facts/workstation/package.yml b/facts/workstation/package.yml index 323d93e..c38257e 100644 --- a/facts/workstation/package.yml +++ b/facts/workstation/package.yml @@ -35,6 +35,14 @@ when: ansible_distribution == "Debian" +- name: Workstation | Facts | Package | Arch + Manjaro + set_fact: + flatpak_distro: true + firefox_esr: firefox + psutil: python-psutil + when: ansible_distribution == "Archlinux" + + - name: Workstation | Facts | Package | FreeBSD set_fact: flatpak_distro: false