From cdaa408df99e0a7ab3bb181a8bf071e298789fd8 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 13 Jul 2021 21:10:47 -0500 Subject: [PATCH] Variablize /etc/rc.conf. Enable FuseFS more properly. --- facts/general/system.yml | 2 ++ tasks/general/software/services.yml | 12 +++++++++++- tasks/workstation/freebsd/software/gui.yml | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/facts/general/system.yml b/facts/general/system.yml index 7f3eb15..c7ee259 100644 --- a/facts/general/system.yml +++ b/facts/general/system.yml @@ -3,6 +3,7 @@ - name: General | Facts | System | Linux set_fact: + rc_conf: /dev/null lynis_install_dir: /usr/local/lynis sudoers_install_dir: /etc/sudoers.d/ when: ansible_system == "Linux" @@ -10,6 +11,7 @@ - name: General | Facts | System | FreeBSD set_fact: + rc_conf: /etc/rc.conf lynis_install_dir: /usr/local/lynis sudoers_install_dir: /usr/local/etc/sudoers.d/ when: ansible_system == "FreeBSD" diff --git a/tasks/general/software/services.yml b/tasks/general/software/services.yml index bd7fee2..f7abe3a 100644 --- a/tasks/general/software/services.yml +++ b/tasks/general/software/services.yml @@ -13,7 +13,17 @@ ## SSHFS ## -- name: General | Software | Services | Enable SSHFS (FreeBSD) +- name: General | Software | Services | Enable FuseFS (FreeBSD rc.conf) + lineinfile: + path: "{{ rc_conf }}" + regexp: 'fusefs_enable=' + line: 'fusefs_enable="YES" # MANAGED BY ANSIBLE' + state: present + create: yes + backup: yes + when: ansible_system == "FreeBSD" + +- name: General | Software | Services | Enable SSHFS (FreeBSD service) service: name: fusefs pattern: fusefs diff --git a/tasks/workstation/freebsd/software/gui.yml b/tasks/workstation/freebsd/software/gui.yml index 9d85106..5b2f4f2 100644 --- a/tasks/workstation/freebsd/software/gui.yml +++ b/tasks/workstation/freebsd/software/gui.yml @@ -21,13 +21,14 @@ - name: Workstation | FreeBSD | GUI | Create rc.conf Entries blockinfile: - path: /etc/rc.conf + path: "{{ rc_conf }}" marker: "# {mark} MANAGED BY ANSIBLE | GUI Components" block: | dbus_enable="YES" hald_enable="YES" gnome_enable="YES" gdm_enable="YES" + create: yes backup: yes - name: Workstation | FreeBSD | GUI | Create proc fstab Entry