diff --git a/facts/general/package.yml b/facts/general/package.yml index 5881115..8e2f322 100644 --- a/facts/general/package.yml +++ b/facts/general/package.yml @@ -7,6 +7,7 @@ thunderbird: thunderbird evolution: evolution sshfs: sshfs + locate: locate when: ansible_distribution == "Pop!_OS" @@ -16,6 +17,7 @@ thunderbird: thunderbird evolution: evolution sshfs: sshfs + locate: locate when: ansible_distribution in ("Debian","Ubuntu") @@ -25,4 +27,5 @@ thunderbird: thunderbird evolution: evolution sshfs: fusefs-sshfs + locate: "" when: ansible_distribution == "FreeBSD" \ No newline at end of file diff --git a/facts/general/system.yml b/facts/general/system.yml index ad19b0e..dc774ee 100644 --- a/facts/general/system.yml +++ b/facts/general/system.yml @@ -3,7 +3,6 @@ - name: Set Pop OS Facts set_fact: - flatpak_distro: true lynis_install_dir: /usr/local/lynis lynis_report: /home/ling/lynis.log sudoers_install_dir: /etc/sudoers.d/ansible @@ -13,7 +12,6 @@ - name: Set Debian and Ubuntu Facts set_fact: - flatpak_distro: true lynis_install_dir: /usr/local/lynis lynis_report: /root/lynis.log sudoers_install_dir: /etc/sudoers.d/ansible @@ -23,7 +21,6 @@ - name: Set FreeBSD Facts set_fact: - flatpak_distro: false lynis_install_dir: /usr/local/lynis lynis_report: /root/lynis.log sudoers_install_dir: /usr/local/etc/sudoers.d/ansible diff --git a/facts/workstation/service.yml b/facts/workstation/service.yml deleted file mode 100644 index c4fe907..0000000 --- a/facts/workstation/service.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -# Define program names per OS for service builtin. - -- name: Set Pop OS Service Names - set_fact: - cups: cups - cups_pattern: cupsd - cups_browse: cups-browsed - cups_browse_pattern: cups-browsed - when: ansible_distribution == "Pop!_OS" - - -- name: Set Debian and Ubuntu Service Names - set_fact: - cups: cups - cups_pattern: cupsd - cups_browse: cups-browsed - cups_browse_pattern: cups-browsed - when: ansible_distribution in ("Debian","Ubuntu") - - -- name: Set FreeBSD Service Names - set_fact: - cups: cups - cups_pattern: cupsd - cups_browse: cups-browsed - cups_browse_pattern: cups-browsed - when: ansible_distribution == "FreeBSD" \ No newline at end of file diff --git a/facts/workstation/system.yml b/facts/workstation/system.yml index ad19b0e..a7c8a91 100644 --- a/facts/workstation/system.yml +++ b/facts/workstation/system.yml @@ -4,28 +4,16 @@ - name: Set Pop OS Facts set_fact: flatpak_distro: true - lynis_install_dir: /usr/local/lynis - lynis_report: /home/ling/lynis.log - sudoers_install_dir: /etc/sudoers.d/ansible - ansible_pull_exec: /usr/bin/ansible-pull when: ansible_distribution == "Pop!_OS" - name: Set Debian and Ubuntu Facts set_fact: flatpak_distro: true - lynis_install_dir: /usr/local/lynis - lynis_report: /root/lynis.log - sudoers_install_dir: /etc/sudoers.d/ansible - ansible_pull_exec: /usr/bin/ansible-pull when: ansible_distribution in ("Debian","Ubuntu") - name: Set FreeBSD Facts set_fact: flatpak_distro: false - lynis_install_dir: /usr/local/lynis - lynis_report: /root/lynis.log - sudoers_install_dir: /usr/local/etc/sudoers.d/ansible - ansible_pull_exec: /usr/local/bin/ansible-pull when: ansible_distribution == "FreeBSD" \ No newline at end of file diff --git a/facts/workstation/user.yml b/facts/workstation/user.yml deleted file mode 100644 index e8b2121..0000000 --- a/facts/workstation/user.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Define users and groups per OS type. - -- name: Set Linux User Variables - set_fact: - root_group: root - when: ansible_system == "Linux" - - -- name: Set FreeBSD User Variables - set_fact: - root_group: wheel - when: ansible_system == "FreeBSD" \ No newline at end of file diff --git a/local.yml b/local.yml index 22eee9c..ae5016d 100644 --- a/local.yml +++ b/local.yml @@ -36,8 +36,6 @@ pre_tasks: - include: facts/workstation/system.yml - include: facts/workstation/package.yml - - include: facts/workstation/service.yml - - include: facts/workstation/user.yml tasks: - include: tasks/linux/software/flatpaks.yml