From 421736e65fe8524edc61efdbb34ae678e4fdfc77 Mon Sep 17 00:00:00 2001
From: Paul Kitt <kitt@dezim-institut.de>
Date: Tue, 26 Mar 2024 12:11:41 +0100
Subject: [PATCH 1/6] Move rstudio_download_url to defaults

---
 defaults/main.yml | 1 +
 vars/_default.yml | 1 -
 vars/_stretch.yml | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index d4ac230..b89f480 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,4 +1,5 @@
 # defaults file
 ---
 rstudio_version: '2023.03.1-446'
+rstudio_download_url: "https://download1.rstudio.org/electron/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
 rstudio_install: []
diff --git a/vars/_default.yml b/vars/_default.yml
index 99d73f1..48b3e84 100644
--- a/vars/_default.yml
+++ b/vars/_default.yml
@@ -1,3 +1,2 @@
 # vars file
 ---
-rstudio_download_url: "https://download1.rstudio.org/electron/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
diff --git a/vars/_stretch.yml b/vars/_stretch.yml
index a99a53e..48b3e84 100644
--- a/vars/_stretch.yml
+++ b/vars/_stretch.yml
@@ -1,3 +1,2 @@
 # vars file
 ---
-rstudio_download_url: "https://download1.rstudio.org/electron/debian9/{{ ansible_machine }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"

From 30b20e4f1e702d211b60dbbe315d6663d9cd6614 Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Thu, 28 Mar 2024 16:26:05 +0100
Subject: [PATCH 2/6] Make rstudio_download_url more configurable

---
 .github/workflows/ci.yml         |  8 +++++---
 Vagrantfile                      | 24 +++++++++++++++++++-----
 defaults/main.yml                |  2 +-
 meta/main.yml                    |  4 +++-
 molecule/default/collections.yml |  6 +-----
 molecule/default/molecule.yml    |  2 +-
 vars/_bookworm.yml               |  3 +++
 vars/_bullseye.yml               |  3 +++
 vars/_buster.yml                 |  3 +++
 vars/_default.yml                |  1 +
 vars/_stretch.yml                |  1 +
 11 files changed, 41 insertions(+), 16 deletions(-)
 create mode 100644 vars/_bookworm.yml
 create mode 100644 vars/_bullseye.yml
 create mode 100644 vars/_buster.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8e94ea8..1d2cd54 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,10 +44,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - distro: debian9
           - distro: debian10
+          - distro: debian11
+          - distro: debian12
           - distro: ubuntu1804
           - distro: ubuntu2004
+          - distro: ubuntu2204
 
     steps:
       - name: Check out the codebase
@@ -61,8 +63,8 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
-
+        run: |
+          pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
       - name: Run Molecule tests
         run: |
           molecule test
diff --git a/Vagrantfile b/Vagrantfile
index cffea0e..5daa6bf 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -16,14 +16,14 @@ boxes = [
     :box => "bento/ubuntu-20.04",
     :ip => '10.0.0.14',
     :cpu => "50",
-    :ram => "384"
+    :ram => "512"
   },
   {
-    :name => "debian-9",
-    :box => "bento/debian-9",
-    :ip => '10.0.0.17',
+    :name => "ubuntu-2204",
+    :box => "bento/ubuntu-22.04",
+    :ip => '10.0.0.15',
     :cpu => "50",
-    :ram => "256"
+    :ram => "512"
   },
   {
     :name => "debian-10",
@@ -32,6 +32,20 @@ boxes = [
     :cpu => "50",
     :ram => "256"
   },
+  {
+    :name => "debian-11",
+    :box => "bento/debian-11",
+    :ip => '10.0.0.19',
+    :cpu => "50",
+    :ram => "256"
+  },
+  {
+    :name => "debian-12",
+    :box => "bento/debian-12",
+    :ip => '10.0.0.20',
+    :cpu => "50",
+    :ram => "256"
+  },
 ]
 
 Vagrant.configure("2") do |config|
diff --git a/defaults/main.yml b/defaults/main.yml
index b89f480..573ff36 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,5 @@
 # defaults file
 ---
 rstudio_version: '2023.03.1-446'
-rstudio_download_url: "https://download1.rstudio.org/electron/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
+rstudio_download_url: "{{ _rstudio_download_url }}"
 rstudio_install: []
diff --git a/meta/main.yml b/meta/main.yml
index a2f2646..6878d75 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -13,10 +13,12 @@ galaxy_info:
       versions:
         - bionic
         - focal
+        - jammy
     - name: Debian
       versions:
-        - stretch
         - buster
+        - bullseye
+        - bookworm
   galaxy_tags:
     - development
     - system
diff --git a/molecule/default/collections.yml b/molecule/default/collections.yml
index c3d7e2a..1062b36 100644
--- a/molecule/default/collections.yml
+++ b/molecule/default/collections.yml
@@ -1,6 +1,2 @@
 ---
-collections:
-  - name: community.docker
-    version: '>=1.2.0,<2'
-  - name: community.general
-    version: '>=2,<3'
+collections: []
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 8841165..908aaf6 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -5,7 +5,7 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu1604}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
diff --git a/vars/_bookworm.yml b/vars/_bookworm.yml
new file mode 100644
index 0000000..3673778
--- /dev/null
+++ b/vars/_bookworm.yml
@@ -0,0 +1,3 @@
+# vars file
+---
+_rstudio_download_url: "https://download1.rstudio.org/electron/jammy/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
diff --git a/vars/_bullseye.yml b/vars/_bullseye.yml
new file mode 100644
index 0000000..b7812bc
--- /dev/null
+++ b/vars/_bullseye.yml
@@ -0,0 +1,3 @@
+# vars file
+---
+_rstudio_download_url: "https://download1.rstudio.org/electron/focal/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
diff --git a/vars/_buster.yml b/vars/_buster.yml
new file mode 100644
index 0000000..ba3a5a8
--- /dev/null
+++ b/vars/_buster.yml
@@ -0,0 +1,3 @@
+# vars file
+---
+_rstudio_download_url: "https://download1.rstudio.org/electron/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
diff --git a/vars/_default.yml b/vars/_default.yml
index 48b3e84..fd862ab 100644
--- a/vars/_default.yml
+++ b/vars/_default.yml
@@ -1,2 +1,3 @@
 # vars file
 ---
+_rstudio_download_url: "https://download1.rstudio.org/electron/{{ ansible_distribution | lower }}/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
diff --git a/vars/_stretch.yml b/vars/_stretch.yml
index 48b3e84..5afe067 100644
--- a/vars/_stretch.yml
+++ b/vars/_stretch.yml
@@ -1,2 +1,3 @@
 # vars file
 ---
+_rstudio_download_url: "https://download1.rstudio.org/electron/debian9/{{ ansible_machine }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"

From de554f231c5b3cb56d178cd1b7957f9cb1967b6f Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Thu, 28 Mar 2024 16:37:57 +0100
Subject: [PATCH 3/6] Fix _default.yml

---
 vars/_default.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vars/_default.yml b/vars/_default.yml
index fd862ab..22c82a4 100644
--- a/vars/_default.yml
+++ b/vars/_default.yml
@@ -1,3 +1,3 @@
 # vars file
 ---
-_rstudio_download_url: "https://download1.rstudio.org/electron/{{ ansible_distribution | lower }}/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
+_rstudio_download_url: "https://download1.rstudio.org/electron/{{ ansible_distribution_release }}/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"

From afb3dd7f2568d0a741bf8e6f8ed9afd4eb8ef651 Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Thu, 28 Mar 2024 16:44:17 +0100
Subject: [PATCH 4/6] -> preset

---
 defaults/main.yml  | 2 +-
 vars/_bookworm.yml | 2 +-
 vars/_bullseye.yml | 2 +-
 vars/_buster.yml   | 2 +-
 vars/_default.yml  | 2 +-
 vars/_stretch.yml  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 573ff36..dd58869 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,5 @@
 # defaults file
 ---
 rstudio_version: '2023.03.1-446'
-rstudio_download_url: "{{ _rstudio_download_url }}"
+rstudio_download_url: "{{ rstudio_preset_download_url }}"
 rstudio_install: []
diff --git a/vars/_bookworm.yml b/vars/_bookworm.yml
index 3673778..82f2c03 100644
--- a/vars/_bookworm.yml
+++ b/vars/_bookworm.yml
@@ -1,3 +1,3 @@
 # vars file
 ---
-_rstudio_download_url: "https://download1.rstudio.org/electron/jammy/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
+rstudio_preset_download_url: "https://download1.rstudio.org/electron/jammy/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
diff --git a/vars/_bullseye.yml b/vars/_bullseye.yml
index b7812bc..32a31c3 100644
--- a/vars/_bullseye.yml
+++ b/vars/_bullseye.yml
@@ -1,3 +1,3 @@
 # vars file
 ---
-_rstudio_download_url: "https://download1.rstudio.org/electron/focal/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
+rstudio_preset_download_url: "https://download1.rstudio.org/electron/focal/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
diff --git a/vars/_buster.yml b/vars/_buster.yml
index ba3a5a8..a6f7b89 100644
--- a/vars/_buster.yml
+++ b/vars/_buster.yml
@@ -1,3 +1,3 @@
 # vars file
 ---
-_rstudio_download_url: "https://download1.rstudio.org/electron/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
+rstudio_preset_download_url: "https://download1.rstudio.org/electron/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
diff --git a/vars/_default.yml b/vars/_default.yml
index 22c82a4..feb803b 100644
--- a/vars/_default.yml
+++ b/vars/_default.yml
@@ -1,3 +1,3 @@
 # vars file
 ---
-_rstudio_download_url: "https://download1.rstudio.org/electron/{{ ansible_distribution_release }}/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
+rstudio_preset_download_url: "https://download1.rstudio.org/electron/{{ ansible_distribution_release }}/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
diff --git a/vars/_stretch.yml b/vars/_stretch.yml
index 5afe067..371f126 100644
--- a/vars/_stretch.yml
+++ b/vars/_stretch.yml
@@ -1,3 +1,3 @@
 # vars file
 ---
-_rstudio_download_url: "https://download1.rstudio.org/electron/debian9/{{ ansible_machine }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
+rstudio_preset_download_url: "https://download1.rstudio.org/electron/debian9/{{ ansible_machine }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"

From 6f11d862bd053753d81c5c68e93232bd47b53371 Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Thu, 28 Mar 2024 16:48:04 +0100
Subject: [PATCH 5/6] Fix 20.04

---
 vars/_focal.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 vars/_focal.yml

diff --git a/vars/_focal.yml b/vars/_focal.yml
new file mode 100644
index 0000000..a6f7b89
--- /dev/null
+++ b/vars/_focal.yml
@@ -0,0 +1,3 @@
+# vars file
+---
+rstudio_preset_download_url: "https://download1.rstudio.org/electron/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"

From 085318f75974f3fabb9776548e48a90d6ffd0df8 Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Thu, 28 Mar 2024 17:08:51 +0100
Subject: [PATCH 6/6] Fix _bullseye

---
 vars/_bullseye.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vars/_bullseye.yml b/vars/_bullseye.yml
index 32a31c3..a6f7b89 100644
--- a/vars/_bullseye.yml
+++ b/vars/_bullseye.yml
@@ -1,3 +1,3 @@
 # vars file
 ---
-rstudio_preset_download_url: "https://download1.rstudio.org/electron/focal/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
+rstudio_preset_download_url: "https://download1.rstudio.org/electron/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"