From 6633e62c77d916e131f832ecff16b206a5961aac Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Tue, 2 Feb 2021 20:44:31 -0600
Subject: [PATCH] Split package facts between CLI and UI.

---
 facts/general/package.yml         | 12 ++----------
 facts/general/service.yml         |  2 +-
 facts/general/system.yml          |  2 +-
 facts/workstation/package.yml     | 15 ++++++++-------
 facts/workstation/system.yml      |  2 +-
 tasks/freebsd/software/gui.yml    |  3 ++-
 tasks/linux/software/flatpaks.yml |  1 +
 7 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/facts/general/package.yml b/facts/general/package.yml
index 297c393..99441e9 100644
--- a/facts/general/package.yml
+++ b/facts/general/package.yml
@@ -1,11 +1,9 @@
 ---
 # Define program names per OS for package builtin.
+# This file is for ALL systems and should not include UI components.
 
 - name: Set Pop OS Package Names
   set_fact:
-    firefox: firefox-esr
-    thunderbird: thunderbird
-    evolution: evolution
     sshfs: sshfs
     locate: locate
   when: ansible_distribution == "Pop!_OS"
@@ -13,9 +11,6 @@
 
 - name: Set Debian and Ubuntu Package Names
   set_fact:
-    firefox: firefox-esr
-    thunderbird: thunderbird
-    evolution: evolution
     sshfs: sshfs
     locate: locate
   when: ansible_distribution in ("Debian","Ubuntu")
@@ -23,9 +18,6 @@
 
 - name: Set FreeBSD Package Names
   set_fact:
-    firefox: firefox-esr
-    thunderbird: thunderbird
-    evolution: evolution
     sshfs: fusefs-sshfs
     locate: htop # This is just a placeholder to prevent errors
-  when: ansible_distribution == "FreeBSD"
\ No newline at end of file
+  when: ansible_system == "FreeBSD"
\ No newline at end of file
diff --git a/facts/general/service.yml b/facts/general/service.yml
index c4fe907..81c1b5c 100644
--- a/facts/general/service.yml
+++ b/facts/general/service.yml
@@ -25,4 +25,4 @@
     cups_pattern: cupsd
     cups_browse: cups-browsed
     cups_browse_pattern: cups-browsed
-  when: ansible_distribution == "FreeBSD"
\ No newline at end of file
+  when: ansible_system == "FreeBSD"
\ No newline at end of file
diff --git a/facts/general/system.yml b/facts/general/system.yml
index dc774ee..058f22a 100644
--- a/facts/general/system.yml
+++ b/facts/general/system.yml
@@ -25,4 +25,4 @@
     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
+  when: ansible_system == "FreeBSD"
\ No newline at end of file
diff --git a/facts/workstation/package.yml b/facts/workstation/package.yml
index 5881115..23936ff 100644
--- a/facts/workstation/package.yml
+++ b/facts/workstation/package.yml
@@ -1,28 +1,29 @@
 ---
 # Define program names per OS for package builtin.
+# This is only for Workstation devices with UIs.
 
 - name: Set Pop OS Package Names
   set_fact:
-    firefox: firefox-esr
+    firefox: firefox
+    firefox-esr: firefox-esr
     thunderbird: thunderbird
     evolution: evolution
-    sshfs: sshfs
   when: ansible_distribution == "Pop!_OS"
 
 
 - name: Set Debian and Ubuntu Package Names
   set_fact:
-    firefox: firefox-esr
+    firefox: firefox
+    firefox-esr: firefox-esr
     thunderbird: thunderbird
     evolution: evolution
-    sshfs: sshfs
   when: ansible_distribution in ("Debian","Ubuntu")
 
 
 - name: Set FreeBSD Package Names
   set_fact:
-    firefox: firefox-esr
+    firefox: firefox
+    firefox-esr: firefox-esr
     thunderbird: thunderbird
     evolution: evolution
-    sshfs: fusefs-sshfs
-  when: ansible_distribution == "FreeBSD"
\ No newline at end of file
+  when: ansible_system == "FreeBSD"
\ No newline at end of file
diff --git a/facts/workstation/system.yml b/facts/workstation/system.yml
index a7c8a91..40c1797 100644
--- a/facts/workstation/system.yml
+++ b/facts/workstation/system.yml
@@ -16,4 +16,4 @@
 - name: Set FreeBSD Facts
   set_fact:
     flatpak_distro: false
-  when: ansible_distribution == "FreeBSD"
\ No newline at end of file
+  when: ansible_system == "FreeBSD"
\ No newline at end of file
diff --git a/tasks/freebsd/software/gui.yml b/tasks/freebsd/software/gui.yml
index f41798a..cd96e7a 100644
--- a/tasks/freebsd/software/gui.yml
+++ b/tasks/freebsd/software/gui.yml
@@ -6,13 +6,14 @@
     name:
     - xorg
     - gnome3
-    - "{{ firefox }}"
+    - "{{ firefox-esr }}"
     - "{{ thunderbird }}"
     state: present
 
 - name: FreeBSD | Software | Uninstall Bloat
   package: 
     name:
+    - "{{ firefox }}"
     - "{{ evolution }}"
     state: absent
 
diff --git a/tasks/linux/software/flatpaks.yml b/tasks/linux/software/flatpaks.yml
index b5040ca..a4263b9 100644
--- a/tasks/linux/software/flatpaks.yml
+++ b/tasks/linux/software/flatpaks.yml
@@ -35,6 +35,7 @@
   package: 
     name:
     - "{{ firefox }}"
+    - "{{ firefox-esr }}"
     - "{{ thunderbird }}"
     - "{{ evolution }}"
     state: absent
\ No newline at end of file