From 82eb58877ca529ebc6ff7bc3e09d70f6fbcfb237 Mon Sep 17 00:00:00 2001 From: Jacob Babor Date: Fri, 21 Apr 2023 19:46:41 -0500 Subject: [PATCH] Add dsk-ryzen-1 to workstations, put debian-specific stuff in that role into a block --- playbooks/device_roles_workstation.yml | 1 + roles/desktop/tasks/main.yml | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/playbooks/device_roles_workstation.yml b/playbooks/device_roles_workstation.yml index ce13af2..53310b4 100755 --- a/playbooks/device_roles_workstation.yml +++ b/playbooks/device_roles_workstation.yml @@ -21,6 +21,7 @@ tags: [ backup ] - hosts: dsk-ryzen-1.ws.mgmt.desu.ltd roles: + - role: desktop - role: backup vars: backup_s3backup_tar_args_extra: h diff --git a/roles/desktop/tasks/main.yml b/roles/desktop/tasks/main.yml index bcebedd..2abd91e 100644 --- a/roles/desktop/tasks/main.yml +++ b/roles/desktop/tasks/main.yml @@ -12,9 +12,12 @@ - 90-touchpad.conf - name: configure packages include_tasks: packages.yml -- name: configure plymouth - alternatives: name=default.plymouth path=/usr/share/plymouth/themes/bgrt/bgrt.plymouth - notify: regen initramfs - when: ansible_os_family != "Gentoo" -- name: ensure unattended-upgrades is installed - ansible.builtin.apt: name=unattended-upgrades state=present +- name: configure debian-specific stuff + block: + - name: configure plymouth + alternatives: name=default.plymouth path=/usr/share/plymouth/themes/bgrt/bgrt.plymouth + notify: regen initramfs + when: ansible_os_family != "Gentoo" + - name: ensure unattended-upgrades is installed + ansible.builtin.apt: name=unattended-upgrades state=present + when: ansible_pkg_mgr == "apt"