Add a new laptop, rebase zerotier repo

playbooks/device_roles_workstation.yml

@@ -4,12 +4,12 @@
   # Home desktops
 - hosts: device_roles_workstation
   tasks:
-    - name: assure vm-fs-1 nfs mountpoint
+#    - name: assure vm-fs-1 nfs mountpoint
-      file: path=/nfs/vm-fs-1.home.mgmt.desu.ltd state=directory
+#      file: path=/nfs/vm-fs-1.home.mgmt.desu.ltd state=directory
-      tags: [ desktop, nfs ]
+#      tags: [ desktop, nfs ]
-    - name: assure vm-fs-1 nfs mount
+#    - 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
+#      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 ]
+#      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:

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 ]

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:

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

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