Seeing if defining the variable with no value is OK. ALso some specialization of the workstation facts.

This commit is contained in:
Hyperling 2021-02-02 20:27:15 -06:00
parent 668fd67fd0
commit b6868cbd24
6 changed files with 3 additions and 58 deletions

View File

@ -7,6 +7,7 @@
thunderbird: thunderbird
evolution: evolution
sshfs: sshfs
locate: locate
when: ansible_distribution == "Pop!_OS"
@ -16,6 +17,7 @@
thunderbird: thunderbird
evolution: evolution
sshfs: sshfs
locate: locate
when: ansible_distribution in ("Debian","Ubuntu")
@ -25,4 +27,5 @@
thunderbird: thunderbird
evolution: evolution
sshfs: fusefs-sshfs
locate: ""
when: ansible_distribution == "FreeBSD"

View File

@ -3,7 +3,6 @@
- name: Set Pop OS Facts
set_fact:
flatpak_distro: true
lynis_install_dir: /usr/local/lynis
lynis_report: /home/ling/lynis.log
sudoers_install_dir: /etc/sudoers.d/ansible
@ -13,7 +12,6 @@
- name: Set Debian and Ubuntu Facts
set_fact:
flatpak_distro: true
lynis_install_dir: /usr/local/lynis
lynis_report: /root/lynis.log
sudoers_install_dir: /etc/sudoers.d/ansible
@ -23,7 +21,6 @@
- name: Set FreeBSD Facts
set_fact:
flatpak_distro: false
lynis_install_dir: /usr/local/lynis
lynis_report: /root/lynis.log
sudoers_install_dir: /usr/local/etc/sudoers.d/ansible

View File

@ -1,28 +0,0 @@
---
# Define program names per OS for service builtin.
- name: Set Pop OS Service Names
set_fact:
cups: cups
cups_pattern: cupsd
cups_browse: cups-browsed
cups_browse_pattern: cups-browsed
when: ansible_distribution == "Pop!_OS"
- name: Set Debian and Ubuntu Service Names
set_fact:
cups: cups
cups_pattern: cupsd
cups_browse: cups-browsed
cups_browse_pattern: cups-browsed
when: ansible_distribution in ("Debian","Ubuntu")
- name: Set FreeBSD Service Names
set_fact:
cups: cups
cups_pattern: cupsd
cups_browse: cups-browsed
cups_browse_pattern: cups-browsed
when: ansible_distribution == "FreeBSD"

View File

@ -4,28 +4,16 @@
- name: Set Pop OS Facts
set_fact:
flatpak_distro: true
lynis_install_dir: /usr/local/lynis
lynis_report: /home/ling/lynis.log
sudoers_install_dir: /etc/sudoers.d/ansible
ansible_pull_exec: /usr/bin/ansible-pull
when: ansible_distribution == "Pop!_OS"
- name: Set Debian and Ubuntu Facts
set_fact:
flatpak_distro: true
lynis_install_dir: /usr/local/lynis
lynis_report: /root/lynis.log
sudoers_install_dir: /etc/sudoers.d/ansible
ansible_pull_exec: /usr/bin/ansible-pull
when: ansible_distribution in ("Debian","Ubuntu")
- name: Set FreeBSD Facts
set_fact:
flatpak_distro: false
lynis_install_dir: /usr/local/lynis
lynis_report: /root/lynis.log
sudoers_install_dir: /usr/local/etc/sudoers.d/ansible
ansible_pull_exec: /usr/local/bin/ansible-pull
when: ansible_distribution == "FreeBSD"

View File

@ -1,13 +0,0 @@
---
# Define users and groups per OS type.
- name: Set Linux User Variables
set_fact:
root_group: root
when: ansible_system == "Linux"
- name: Set FreeBSD User Variables
set_fact:
root_group: wheel
when: ansible_system == "FreeBSD"

View File

@ -36,8 +36,6 @@
pre_tasks:
- include: facts/workstation/system.yml
- include: facts/workstation/package.yml
- include: facts/workstation/service.yml
- include: facts/workstation/user.yml
tasks:
- include: tasks/linux/software/flatpaks.yml