From bb242098db1ed3efbc3a2e11aa05f0fe551b2a80 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 2 Feb 2021 21:31:45 -0600 Subject: [PATCH] Fix dash in variable name. Update hosts file. Better names in local. --- facts/workstation/package.yml | 6 +++--- hosts | 4 +--- local.yml | 6 +++--- tasks/freebsd/software/gui.yml | 2 +- tasks/linux/software/flatpaks.yml | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/facts/workstation/package.yml b/facts/workstation/package.yml index e3700b7..9d6c1ea 100644 --- a/facts/workstation/package.yml +++ b/facts/workstation/package.yml @@ -5,7 +5,7 @@ - name: Facts | Workstation | Package | Pop OS set_fact: firefox: firefox - firefox-esr: firefox-esr + firefox_esr: firefox-esr thunderbird: thunderbird evolution: evolution when: ansible_distribution == "Pop!_OS" @@ -14,7 +14,7 @@ - name: Facts | Workstation | Package | Debian and Ubuntu set_fact: firefox: firefox - firefox-esr: firefox-esr + firefox_esr: firefox-esr thunderbird: thunderbird evolution: evolution when: ansible_distribution in ("Debian","Ubuntu") @@ -23,7 +23,7 @@ - name: Facts | Workstation | Package | FreeBSD set_fact: firefox: firefox - firefox-esr: firefox-esr + firefox_esr: firefox-esr thunderbird: thunderbird evolution: evolution when: ansible_system == "FreeBSD" \ No newline at end of file diff --git a/hosts b/hosts index 40605c3..d279832 100644 --- a/hosts +++ b/hosts @@ -1,7 +1,5 @@ -[everything] -localhost - [workstation] x570 +freeboy dell-laptop usb \ No newline at end of file diff --git a/local.yml b/local.yml index bbb1f7c..6c1ed1c 100644 --- a/local.yml +++ b/local.yml @@ -2,7 +2,7 @@ # Harmonize my systems rather than doing everything manually. :) # Everything -- name: Initial Setup +- name: Main | Default Setup hosts: localhost connection: local become: true @@ -31,7 +31,7 @@ # Workstations -- name: UI Setup +- name: Main | Workstation UI Setup hosts: workstation connection: local become: true @@ -53,7 +53,7 @@ # Run Hardness Checks -- name: Hardening Check +- name: Main | Hardness Checks hosts: localhost connection: local become: true diff --git a/tasks/freebsd/software/gui.yml b/tasks/freebsd/software/gui.yml index a8d4fbe..9bff58f 100644 --- a/tasks/freebsd/software/gui.yml +++ b/tasks/freebsd/software/gui.yml @@ -6,7 +6,7 @@ name: - xorg - gnome3 - - "{{ firefox-esr }}" + - "{{ firefox_esr }}" - "{{ thunderbird }}" state: present diff --git a/tasks/linux/software/flatpaks.yml b/tasks/linux/software/flatpaks.yml index 3f6c372..ab17d31 100644 --- a/tasks/linux/software/flatpaks.yml +++ b/tasks/linux/software/flatpaks.yml @@ -35,7 +35,7 @@ package: name: - "{{ firefox }}" - - "{{ firefox-esr }}" + - "{{ firefox_esr }}" - "{{ thunderbird }}" - "{{ evolution }}" state: absent \ No newline at end of file