From 8e84033568e48c86e2576b3ff67a101c1b4d7f4e Mon Sep 17 00:00:00 2001
From: Aaron Brady <aaron@insom.me.uk>
Date: Mon, 17 Jun 2024 11:28:37 -0400
Subject: [PATCH] Move from Ubuntu Xenial to Debian 12

---
 ansible/roles/brozzler-worker/tasks/main.yml | 15 +++------------
 ansible/roles/rethinkdb/tasks/main.yml       |  2 +-
 vagrant/Vagrantfile                          |  2 +-
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/ansible/roles/brozzler-worker/tasks/main.yml b/ansible/roles/brozzler-worker/tasks/main.yml
index 219399a..d9f59dc 100644
--- a/ansible/roles/brozzler-worker/tasks/main.yml
+++ b/ansible/roles/brozzler-worker/tasks/main.yml
@@ -1,24 +1,15 @@
 ---
-- name: ensure canonical partner repo is in apt sources.list
-  apt_repository: repo='deb http://archive.canonical.com/ubuntu trusty partner'
-                  state=present
-  become: true
-
-- apt: update_cache=yes
-  become: true
-
 - name: ensure required packages are installed
   become: true
   apt: name={{item}} state=present
   with_items:
-  - chromium-browser
-  - vnc4server
-  - libjpeg-turbo8-dev
+  - chromium
+  - tigervnc-standalone-server
+  - libjpeg62-turbo-dev
   - zlib1g-dev
   - gcc
   - python3-dev
   - python3-dbg
-  - adobe-flashplugin
   - xfonts-base
   - fonts-arphic-bkai00mp
   - fonts-arphic-bsmi00lp
diff --git a/ansible/roles/rethinkdb/tasks/main.yml b/ansible/roles/rethinkdb/tasks/main.yml
index 9a310ea..6358902 100644
--- a/ansible/roles/rethinkdb/tasks/main.yml
+++ b/ansible/roles/rethinkdb/tasks/main.yml
@@ -4,7 +4,7 @@
   become: true
 - name: ensure rethinkdb repo is in apt sources.list
   apt_repository:
-    repo: 'deb https://download.rethinkdb.com/repository/ubuntu-{{ansible_lsb.codename|lower}} {{ansible_lsb.codename|lower}} main'
+    repo: 'deb https://download.rethinkdb.com/repository/{{ansible_distribution|lower}}-{{ansible_lsb.codename|lower}} {{ansible_lsb.codename|lower}} main'
     state: present
   become: true
 - apt: update_cache=yes
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index c894c63..e42d40a 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -1,5 +1,5 @@
 Vagrant.configure(2) do |config|
-  config.vm.box = "ubuntu/xenial64"
+  config.vm.box = "generic/debian12"
   config.vm.define "10.9.9.9"
   config.vm.hostname = "brzl"
   config.vm.network :private_network, ip: "10.9.9.9"