From 62aefb0ffbda7162fef32d8d369962fbf0625f8b Mon Sep 17 00:00:00 2001 From: Hyperling Date: Sat, 6 Feb 2021 07:49:11 -0600 Subject: [PATCH] Dangit, cancelled the ansible-pull job again. Also fix root cron being done twice. --- tasks/general/acct_mgmt/mounts.yml | 14 ++------------ tasks/general/cron/ansible.yml | 4 ++-- tasks/general/cron/root.yml | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/tasks/general/acct_mgmt/mounts.yml b/tasks/general/acct_mgmt/mounts.yml index 6298c9f..72ce402 100644 --- a/tasks/general/acct_mgmt/mounts.yml +++ b/tasks/general/acct_mgmt/mounts.yml @@ -47,23 +47,13 @@ # FreeBSD has to do this via root cron job, fstab is unhappy -- name: General | Cron | Root | Create SSHFS Job (FreeBSD) - cron: - user: root - name: "1337 SSHFS" - special_time: reboot - job: "{{ sshfs_leet_cmd }}" - state: present - disabled: no - when: ansible_system == "FreeBSD" - -- name: General | Cron | Root | Unmount SSHFS (FreeBSD) +- name: General | Account Management | Mounts | Unmount 1337 (FreeBSD) shell: umount -f /mnt/leet args: warn: false when: ansible_system == "FreeBSD" ignore_errors: yes -- name: General | Cron | Root | Mount SSHFS (FreeBSD) +- name: General | Account Management | Mounts | Remount 1337 (FreeBSD) shell: "{{ sshfs_leet_cmd }}" when: ansible_system == "FreeBSD" \ No newline at end of file diff --git a/tasks/general/cron/ansible.yml b/tasks/general/cron/ansible.yml index 797c4cc..0e3c3df 100644 --- a/tasks/general/cron/ansible.yml +++ b/tasks/general/cron/ansible.yml @@ -13,8 +13,8 @@ - name: General | Cron | Ansible | Create Heartbeat Job cron: user: ansible - name: "Ansible Sync" + name: "Heartbeat Report" minute: "*/15" - job: "echo {{ ansible_date_time.iso8601_basic_short }} > {{ heartbeat_report }}; chmod 777 {{ heartbeat_report }}" + job: "date > {{ heartbeat_report }}; chmod 777 {{ heartbeat_report }}" state: present disabled: no diff --git a/tasks/general/cron/root.yml b/tasks/general/cron/root.yml index 4807a7e..29aa3a7 100644 --- a/tasks/general/cron/root.yml +++ b/tasks/general/cron/root.yml @@ -1,7 +1,7 @@ --- # Jobs relating to the root user. -- name: General | Cron | Root | Create SSHFS Job +- name: General | Cron | Root | Create SSHFS Job (FreeBSD) cron: user: root name: "1337 SSHFS"