From f46d2495f26868932ef676543207be00e0af1918 Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Sat, 6 Feb 2021 07:00:47 -0600
Subject: [PATCH] More 1337 share work.

---
 facts/general/service.yml          |  2 +-
 tasks/general/acct_mgmt/mounts.yml | 39 ++++++++++++++++++++++++------
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/facts/general/service.yml b/facts/general/service.yml
index 34bb7dd..708b6fb 100644
--- a/facts/general/service.yml
+++ b/facts/general/service.yml
@@ -16,5 +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_other,_netdev"
+    sshfs_leet_cmd: "sshfs ling@leet: /mnt/leet -o allow_other,_netdev"
   when: ansible_system == "FreeBSD"
\ No newline at end of file
diff --git a/tasks/general/acct_mgmt/mounts.yml b/tasks/general/acct_mgmt/mounts.yml
index 7a8a328..4984b96 100644
--- a/tasks/general/acct_mgmt/mounts.yml
+++ b/tasks/general/acct_mgmt/mounts.yml
@@ -7,33 +7,47 @@
     state: directory
     mode: '0755'
 
-# Combine these to be blockinfile again
+
+# Linux uses fstab
 - name: General | Account Management | Mounts | Create 1337 fstab Entry
-  lineinfile:
+  blockinfile:
     path: /etc/fstab
-    regexp: '^ling@leet'
-    line: "ling@leet: /mnt/leet fuse.sshfs defaults,_netdev,allow_other,delay_connect 0 0"
+    block: |
+      ling@leet: /mnt/leet fuse.sshfs defaults,_netdev,allow_other,delay_connect 0 0
+    marker: '# {mark} MANAGED BY ANSIBLE | Leet Share'
     state: present
     backup: yes
   when: ansible_system == "Linux"
 
+#TODO Remove this
 - name: General | Account Management | Mounts | Create 1337 fstab Comment
   lineinfile:
     path: /etc/fstab
     regexp: '^# MANAGED BY ANSIBLE | Leet Share'
     line: '# MANAGED BY ANSIBLE | Leet Share'
-    state: present
+    state: absent
     insertbefore: '^ling@leet'
   when: ansible_system == "Linux"
 
-- name: General | Account Management | Mounts | Mount All
+#TODO Remove this
+- name: General | Account Management | Mounts | Create 1337 fstab Entry
+  lineinfile:
+    path: /etc/fstab
+    regexp: '^ling@leet'
+    line: "ling@leet: /mnt/leet fuse.sshfs defaults,_netdev,allow_other,delay_connect 0 0"
+    state: absent
+    backup: yes
+  when: ansible_system == "Linux"
+
+- name: General | Account Management | Mounts | Mount All (Linux)
   shell: mount -a
   args:
     warn: false
   when: ansible_system == "Linux"
 
+
 # FreeBSD has to do this via root cron job, fstab is unhappy
-- name: General | Cron | Root | Create SSHFS Job
+- name: General | Cron | Root | Create SSHFS Job (FreeBSD)
   cron:
     user: root
     name: "1337 SSHFS"
@@ -41,4 +55,15 @@
     job: "{{ sshfs_leet_cmd }}"
     state: present
     disabled: no
+  when: ansible_system == "FreeBSD"
+
+- name: General | Cron | Root | Unmount SSHFS (FreeBSD)
+  shell: umount -f /mnt/leet
+  args:
+    warn: false
+  when: ansible_system == "FreeBSD"
+  ignore_errors: yes
+
+- name: General | Cron | Root | Mount SSHFS (FreeBSD)
+  shell: "{{ sshfs_leet_cmd }}"
   when: ansible_system == "FreeBSD"
\ No newline at end of file