General FreeBSD and account improvements.

facts/general/gather.yml

@@ -1,6 +1,10 @@
 ---
 # Facts that must be gathered after running tasks.
 
-- name: Facts | General | Gather | Locate BASH
+- name: Facts | General | Gather | Locate bash
   shell: which bash
-  register: bash_exec
+  register: bash_exec
+
+- name: Facts | General | Gather | Locate ansible-pull
+  shell: which ansible-pull
+  register: ansible_pull_exec

facts/general/package.yml

@@ -1,23 +1,16 @@
 ---
-# Define program names per OS for package builtin.
+# Define program names for package builtin.
 # This file is for ALL systems and should not include UI components.
 
-- name: Facts | Workstation | Package | Pop OS
+- name: Facts | Workstation | Package | apt
   set_fact:
     sshfs: sshfs
     locate: locate
-  when: ansible_distribution == "Pop!_OS"
-
-
-- name: Facts | Workstation | Package | Debian and Ubuntu
-  set_fact:
-    sshfs: sshfs
-    locate: locate
-  when: ansible_distribution in ("Debian","Ubuntu")
-
+  when: ansible_pkg_mgr == "apt"
+  
 
 - name: Facts | Workstation | Package | FreeBSD
   set_fact:
     sshfs: fusefs-sshfs
-    locate: htop # This is just a placeholder to prevent errors
+    locate: htop # Placeholder to prevent errors. locate builtin FreeBSD.
   when: ansible_system == "FreeBSD"

facts/general/service.yml

@@ -1,22 +1,13 @@
 ---
-# Define program names per OS for service builtin.
+# Define program names for service builtin.
 
-- name: Facts | Workstation | Service | Pop OS
+- name: Facts | Workstation | Service | Linux
   set_fact:
     cups: cups
     cups_pattern: cupsd
     cups_browse: cups-browsed
     cups_browse_pattern: cups-browsed
-  when: ansible_distribution == "Pop!_OS"
-
-
-- name: Facts | Workstation | Service | Debian and Ubuntu
-  set_fact:
-    cups: cups
-    cups_pattern: cupsd
-    cups_browse: cups-browsed
-    cups_browse_pattern: cups-browsed
-  when: ansible_distribution in ("Debian","Ubuntu")
+  when: ansible_system == "Linux"
 
 
 - name: Facts | Workstation | Service | FreeBSD
@@ -25,4 +16,5 @@
     cups_pattern: cupsd
     cups_browse: cups-browsed
     cups_browse_pattern: cups-browsed
+    sshfs_leet_cmd: "sshfs ling@leet: /mnt/leet -o defaults.allow_othher,_netdev"
   when: ansible_system == "FreeBSD"

facts/general/system.yml

@@ -6,7 +6,6 @@
     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"
 
 
@@ -15,7 +14,6 @@
     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")
 
 
@@ -24,5 +22,4 @@
     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_system == "FreeBSD"