From 1a4f59b71a0cff5c7d27c761cd76805db197876c Mon Sep 17 00:00:00 2001 From: Salt Date: Fri, 21 Jan 2022 16:55:10 -0600 Subject: [PATCH] Add a new laptop, rebase zerotier repo --- playbooks/device_roles_workstation.yml | 49 ++++++++++++++++++++++---- playbooks/platforms_ub2110.yml | 12 +++++++ roles/desktop/defaults/main.yml | 5 +-- roles/zerotier/tasks/main.yml | 2 +- site.yml | 1 + 5 files changed, 58 insertions(+), 11 deletions(-) create mode 100755 playbooks/platforms_ub2110.yml diff --git a/playbooks/device_roles_workstation.yml b/playbooks/device_roles_workstation.yml index fb15290..7082ced 100755 --- a/playbooks/device_roles_workstation.yml +++ b/playbooks/device_roles_workstation.yml @@ -4,12 +4,12 @@ # Home desktops - hosts: device_roles_workstation tasks: - - name: assure vm-fs-1 nfs mountpoint - file: path=/nfs/vm-fs-1.home.mgmt.desu.ltd state=directory - tags: [ desktop, nfs ] - - name: assure vm-fs-1 nfs mount - mount: path=/nfs/vm-fs-1.home.mgmt.desu.ltd src=vm-fs-1.home.mgmt.desu.ltd:/nfs fstype=nfs4 opts="rsize=10248576,wsize=1048576,soft,timeo=600,retrans=2,_netdev" state=mounted - tags: [ desktop, nfs ] +# - name: assure vm-fs-1 nfs mountpoint +# file: path=/nfs/vm-fs-1.home.mgmt.desu.ltd state=directory +# tags: [ desktop, nfs ] +# - name: assure vm-fs-1 nfs mount +# mount: path=/nfs/vm-fs-1.home.mgmt.desu.ltd src=vm-fs-1.home.mgmt.desu.ltd:/nfs fstype=nfs4 opts="rsize=10248576,wsize=1048576,soft,timeo=600,retrans=2,_netdev" state=mounted +# tags: [ desktop, nfs ] roles: - role: udev vars: @@ -32,6 +32,40 @@ tags: [ desktop, desktop-role ] - role: grub tags: [ desktop, grub ] +- hosts: lap-fw-diy-1.ws.mgmt.desu.ltd + roles: + - role: backup + vars: + backup_s3backup_tar_args_extra: h + backup_s3backup_list_extra: + - /etc/ + - /home/salt/.backup/ + tags: [ backup ] + - role: desktop + vars: + #desktop_apt_repos_extra: + #- "ppa:kubuntu-ppa/backports" # Kubuntu Backports + desktop_apt_packages_extra: + # DE + - bspwm + - compton + - conky-all + - dunst + - kubuntu-desktop + - nitrogen + - pavucontrol-qt + - polybar + - qt5ct + - rofi + - xbacklight + # Applications + - redshift + - xserver-xephyr + tags: [ desktop, desktop-role ] + - role: grub + vars: + grub_cmdline_linux_default: "quiet splash i915.enable_psr=0" + tags: [ desktop, grub ] - hosts: lap-s76-lemp9-1.ws.mgmt.desu.ltd roles: - role: backup @@ -84,6 +118,9 @@ - /home/salt/.backup/ tags: [ backup ] - role: desktop + vars: + desktop_apt_debs_extra: + - "https://github.com/MultiMC/MultiMC5/releases/download/0.6.8/multimc_1.4-1.deb" # MultiMC tags: [ desktop, desktop-role ] # - role: grub # vars: diff --git a/playbooks/platforms_ub2110.yml b/playbooks/platforms_ub2110.yml new file mode 100755 index 0000000..79e3e34 --- /dev/null +++ b/playbooks/platforms_ub2110.yml @@ -0,0 +1,12 @@ +#!/usr/bin/env ansible-playbook +# vim:ft=ansible: +--- +- hosts: platforms_ub2110 + roles: + - role: motd + vars: + motd_watch_services_extra: + - docker + - kubelet + - postgresql + tags: [ motd, common ] diff --git a/roles/desktop/defaults/main.yml b/roles/desktop/defaults/main.yml index 1d97bcb..894eb20 100644 --- a/roles/desktop/defaults/main.yml +++ b/roles/desktop/defaults/main.yml @@ -34,8 +34,6 @@ desktop_apt_repos: - "deb https://apt.kubernetes.io/ kubernetes-xenial main" # Kubernetes - "deb https://baltocdn.com/helm/stable/debian/ all main" # Helm - "deb [arch=amd64] https://apt.releases.hashicorp.com focal main" # Terraform - # Backport PPAs - - "ppa:ubuntustudio-ppa/ardour-backports" # Ardour from Ubuntu Studio # First-party PPAs - "ppa:jackmacwindows/ppa" # CraftOS-PC 2 - "ppa:phoerious/keepassxc" # KeepassXC @@ -131,7 +129,7 @@ desktop_apt_packages: - torbrowser-launcher # Useful utility - virt-manager # Important to manage VMs - vulkan-tools # Pulls in Vulkan support for things like DXVK - - vulkan-utils + #- vulkan-utils - winetricks # Protontricks wraps this, I think - xdotool # Used in one or two macro scripts - zim # Desktop wiki @@ -151,7 +149,6 @@ desktop_apt_packages_remove_extra: [] desktop_apt_debs: - "https://dl.discordapp.net/apps/linux/0.0.16/discord-0.0.16.deb" # Discord - - "https://github.com/MultiMC/MultiMC5/releases/download/0.6.8/multimc_1.4-1.deb" # MultiMC desktop_apt_debs_extra: [] desktop_flatpak_remotes: diff --git a/roles/zerotier/tasks/main.yml b/roles/zerotier/tasks/main.yml index 37617a1..f22e4c0 100644 --- a/roles/zerotier/tasks/main.yml +++ b/roles/zerotier/tasks/main.yml @@ -6,7 +6,7 @@ - name: ensure zerotier repo key apt_key: url=https://raw.githubusercontent.com/zerotier/ZeroTierOne/master/doc/contact%40zerotier.com.gpg - name: ensure zerotier repo - apt_repository: repo="deb http://download.zerotier.com/debian/buster buster main" + apt_repository: repo="deb http://download.zerotier.com/debian/bionic bionic main" - name: update apt cache apt: update_cache=yes cache_valid_time=86400 - name: ensure packages diff --git a/site.yml b/site.yml index a6ab36a..b5c82c1 100755 --- a/site.yml +++ b/site.yml @@ -6,6 +6,7 @@ - import_playbook: playbooks/all_scanner.yml # Platform configuration - import_playbook: playbooks/platforms_ub2004.yml +- import_playbook: playbooks/platforms_ub2110.yml - import_playbook: playbooks/platforms_proxmox-ve-7.yml # Manufacturer configuration - import_playbook: playbooks/manufacturers_raspi.yml