From de1c43e7d94c40b6941eafba978f1d65b535f166 Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Wed, 3 Feb 2021 08:03:12 -0600
Subject: [PATCH] Start moving back to blocks, easier to manage comments.
---
tasks/general/acct_mgmt/keys.yml | 4 ++--
tasks/general/software/services.yml | 16 ++++------------
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/tasks/general/acct_mgmt/keys.yml b/tasks/general/acct_mgmt/keys.yml
index 5d2bd46..16e60b9 100644
--- a/tasks/general/acct_mgmt/keys.yml
+++ b/tasks/general/acct_mgmt/keys.yml
@@ -6,11 +6,11 @@
# openssh_keypair:
# path: /root/.ssh/id_rsa
-- name: General | Account Management | SSH Key | Root | Create
+- name: General | Account Management | Keys | Root | Create SSH
shell: ssh-keygen -t rsa -N '' -f ~/.ssh/id_rsa <<< n
args:
executable: "{{ bash_exec.stdout }}"
ignore_errors: yes
-- name: General | Account Management | SSH Key | Root | Copy to 1337
+- name: General | Account Management | Keys | Root | Copy SSH to 1337
shell: ssh-copy-id -i /root/.ssh/id_rsa ling@leet
\ No newline at end of file
diff --git a/tasks/general/software/services.yml b/tasks/general/software/services.yml
index b0ffddc..594869b 100644
--- a/tasks/general/software/services.yml
+++ b/tasks/general/software/services.yml
@@ -2,23 +2,15 @@
# Enable and disable services.
- name: General | Software | Services | Create SSHFS rc.conf Entry (FreeBSD)
- lineinfile:
+ blockinfile:
path: /etc/rc.conf
- regexp: '^fusefs_enable='
- line: fusefs_enable="YES"
+ block: |
+ fusefs_enable="YES"
+ marker: "# {mark} MANAGED BY ANSIBLE | SSHFS"
state: present
backup: yes
when: ansible_system == "FreeBSD"
-- name: General | Software | Services | Create SSHFS rc.conf Comment (FreeBSD)
- lineinfile:
- path: /etc/fstab
- regexp: '^# MANAGED BY ANSIBLE | SSHFS'
- line: '# MANAGED BY ANSIBLE | SSHFS'
- state: present
- insertbefore: '^fusefs_enable='
- when: ansible_system == "FreeBSD"
-
- name: General | Software | Services | Load SSHFS (FreeBSD)
shell: kldload fusefs
args: