From 74eb4aa6436c541bb493bdf140b53ec8ae7927fb Mon Sep 17 00:00:00 2001 From: Jordan Layfield Date: Tue, 4 Jun 2024 13:56:28 +0100 Subject: [PATCH 1/5] initial version NO_JIRA --- tasks/AlmaLinux.yml | 15 +++++++++++++++ vars/AlmaLinux.yml | 11 +++++++++++ 2 files changed, 26 insertions(+) create mode 100644 tasks/AlmaLinux.yml create mode 100644 vars/AlmaLinux.yml diff --git a/tasks/AlmaLinux.yml b/tasks/AlmaLinux.yml new file mode 100644 index 0000000..896b87b --- /dev/null +++ b/tasks/AlmaLinux.yml @@ -0,0 +1,15 @@ +--- +- name: Set up package managers for required tools + ansible.builtin.include_role: + name: ccdc.package_manager_configuration + +- name: Install desktop environment + ansible.builtin.package: + name: "{{ package }}" + loop: "{{ desktop_packages }}" + loop_control: + loop_var: package + become: true + +- name: Run common Linux setup + ansible.builtin.include_tasks: Linux.yml diff --git a/vars/AlmaLinux.yml b/vars/AlmaLinux.yml new file mode 100644 index 0000000..116f903 --- /dev/null +++ b/vars/AlmaLinux.yml @@ -0,0 +1,11 @@ +gdm_config_file: /etc/gdm/custom.conf + +desktop_packages: + # EPEL is required for dkms on RedHat >=7 + - "epel-release" + - "@^Server with GUI" + - "firefox" + # This is required for the dconf module to disable screen locking + - "python3-psutil" + # DKMS will stop system updates from breaking VM guest extensions + - "dkms" From 7e8aa63d09960459557285f551457c8e218518fa Mon Sep 17 00:00:00 2001 From: Jordan Layfield Date: Tue, 4 Jun 2024 14:18:26 +0100 Subject: [PATCH 2/5] quick fix NO_JIRA --- vars/AlmaLinux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/AlmaLinux.yml b/vars/AlmaLinux.yml index 116f903..34ea36a 100644 --- a/vars/AlmaLinux.yml +++ b/vars/AlmaLinux.yml @@ -3,7 +3,7 @@ gdm_config_file: /etc/gdm/custom.conf desktop_packages: # EPEL is required for dkms on RedHat >=7 - "epel-release" - - "@^Server with GUI" + - "@Server with GUI" - "firefox" # This is required for the dconf module to disable screen locking - "python3-psutil" From a082fbe60ab6b5423286e0710c2b257555d0b791 Mon Sep 17 00:00:00 2001 From: Jordan Layfield <77847327+layfield-ccdc@users.noreply.github.com> Date: Fri, 28 Jun 2024 16:28:40 +0100 Subject: [PATCH 3/5] ubuntu minimal package TO-246 --- tasks/Debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/Debian.yml b/tasks/Debian.yml index 8937677..56442bc 100644 --- a/tasks/Debian.yml +++ b/tasks/Debian.yml @@ -2,7 +2,7 @@ - name: Install desktop environment ansible.builtin.apt: name: - - ubuntu-desktop + - ubuntu-desktop-minmal - firefox # psutil is required by ansible's dconf module - python3-psutil From 7a08ef4a123b1d48c5d745aabc931011bb75d113 Mon Sep 17 00:00:00 2001 From: Jordan Layfield <77847327+layfield-ccdc@users.noreply.github.com> Date: Fri, 28 Jun 2024 16:30:07 +0100 Subject: [PATCH 4/5] spell check TO-246 --- tasks/Debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/Debian.yml b/tasks/Debian.yml index 56442bc..226f4c1 100644 --- a/tasks/Debian.yml +++ b/tasks/Debian.yml @@ -2,7 +2,7 @@ - name: Install desktop environment ansible.builtin.apt: name: - - ubuntu-desktop-minmal + - ubuntu-desktop-minimal - firefox # psutil is required by ansible's dconf module - python3-psutil From 570e0e097f4243856db494f5b06c835c2ae6f343 Mon Sep 17 00:00:00 2001 From: Jordan Layfield Date: Fri, 28 Jun 2024 16:33:09 +0100 Subject: [PATCH 5/5] linting TO-246 --- tasks/AlmaLinux.yml | 2 +- vars/AlmaLinux.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tasks/AlmaLinux.yml b/tasks/AlmaLinux.yml index 896b87b..6b259b9 100644 --- a/tasks/AlmaLinux.yml +++ b/tasks/AlmaLinux.yml @@ -10,6 +10,6 @@ loop_control: loop_var: package become: true - + - name: Run common Linux setup ansible.builtin.include_tasks: Linux.yml diff --git a/vars/AlmaLinux.yml b/vars/AlmaLinux.yml index 34ea36a..d8f49cd 100644 --- a/vars/AlmaLinux.yml +++ b/vars/AlmaLinux.yml @@ -1,3 +1,4 @@ +--- gdm_config_file: /etc/gdm/custom.conf desktop_packages: