From 6f403491ca8c23a343f7406955df60384e37020b Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Mon, 15 Feb 2021 08:40:32 -0600
Subject: [PATCH] Changes for SSHD.

---
 facts/general/package.yml                  |  4 ++--
 facts/general/service.yml                  | 14 ++++++++------
 tasks/general/software/services.yml        | 19 ++++++++++++++++++-
 tasks/workstation/freebsd/cron/ansible.yml |  9 ---------
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/facts/general/package.yml b/facts/general/package.yml
index ef97c04..950d91d 100644
--- a/facts/general/package.yml
+++ b/facts/general/package.yml
@@ -6,7 +6,7 @@
   set_fact:
     sshfs: sshfs
     locate: locate
-    sshd: openssh-server
+    opensshd: openssh-server
   when: ansible_pkg_mgr == "apt"
 
 
@@ -14,7 +14,7 @@
   set_fact:
     sshfs: sshfs
     locate: mlocate
-    sshd: openssh
+    opensshd: openssh
   when: ansible_pkg_mgr == "pacman"
   
 
diff --git a/facts/general/service.yml b/facts/general/service.yml
index c903ad9..f422ffd 100644
--- a/facts/general/service.yml
+++ b/facts/general/service.yml
@@ -1,20 +1,22 @@
 ---
 # Define program names for service builtin.
 
-- name: General | Facts | Service | Linux
+- name: General | Facts | Service | All
   set_fact:
     cups: cups
     cups_pattern: cupsd
     cups_browse: cups-browsed
     cups_browse_pattern: cups-browsed
+    sshd: sshd
+    sshd_pattern: sshd
+    sshfs_leet_cmd: "sshfs {{ leet_ssh }}: /mnt/leet -o allow_other,_netdev"
+
+
+- name: General | Facts | Service | Linux
+  set_fact:
   when: ansible_system == "Linux"
 
 
 - name: General | Facts | Service | FreeBSD
   set_fact:
-    cups: cups
-    cups_pattern: cupsd
-    cups_browse: cups-browsed
-    cups_browse_pattern: cups-browsed
-    sshfs_leet_cmd: "sshfs {{ leet_ssh }}: /mnt/leet -o allow_other,_netdev"
   when: ansible_system == "FreeBSD"
\ No newline at end of file
diff --git a/tasks/general/software/services.yml b/tasks/general/software/services.yml
index 594869b..1ac4ef8 100644
--- a/tasks/general/software/services.yml
+++ b/tasks/general/software/services.yml
@@ -29,4 +29,21 @@
     name: "{{ cups_browse }}"
     pattern: "{{ cups_browse_pattern }}"
     state: stopped
-    enabled: no
\ No newline at end of file
+    enabled: no
+
+- name: General | Software | Services | Enable SSHD (Linux?)
+  service:
+    name: "{{ sshd }}"
+    pattern: "{{ sshd_pattern }}"
+    state: started
+    enabled: yes
+
+- name: General | Software | Services | Create SSHFS rc.conf Entry (FreeBSD)
+  lineinfile:
+    path: /etc/rc.conf
+    regexp: '^sshd_enable='
+    line: 'sshd_enable="YES" # MANAGED BY ANSIBLE'
+    state: present
+    create: yes
+    backup: yes
+  when: ansible_system == "FreeBSD"
\ No newline at end of file
diff --git a/tasks/workstation/freebsd/cron/ansible.yml b/tasks/workstation/freebsd/cron/ansible.yml
index 93269fc..501effe 100644
--- a/tasks/workstation/freebsd/cron/ansible.yml
+++ b/tasks/workstation/freebsd/cron/ansible.yml
@@ -1,15 +1,6 @@
 ---
 # Cron jobs specific to FreeBSD
 
-- name: General | Cron | Ansible | FreeBSD | Enable SSHFS Job
-  cron:
-    user: ansible
-    name: "1337 SSHFS"
-    special_time: reboot
-    job: "sudo {{ sshfs_leet_cmd }}"
-    state: present
-    disabled: no
-
 - name: General | Cron | Ansible | FreeBSD | Enable Security Update
   cron:
     user: ansible