From e40d8f4f069566173e9eb4839818d4d428687303 Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Thu, 1 Jun 2023 11:01:24 +0200
Subject: [PATCH 1/2] Add support for Ubuntu 22.04

---
 .github/workflows/ci.yml | 1 +
 Vagrantfile              | 7 +++++++
 meta/main.yml            | 1 +
 vars/_jammy.yml          | 3 +++
 4 files changed, 12 insertions(+)
 create mode 100644 vars/_jammy.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ec785d8..dc2fb0a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,6 +51,7 @@ jobs:
           - distro: ubuntu1604
           - distro: ubuntu1804
           - distro: ubuntu2004
+          - distro: ubuntu2204
 
     steps:
       - name: Check out the codebase
diff --git a/Vagrantfile b/Vagrantfile
index a72df5b..528f7e8 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -25,6 +25,13 @@ boxes = [
     :cpu => "50",
     :ram => "384"
   },
+  {
+    :name => "ubuntu-2204",
+    :box => "bento/ubuntu-22.04",
+    :ip => '10.0.0.15',
+    :cpu => "50",
+    :ram => "384"
+  },
   {
     :name => "debian-9",
     :box => "bento/debian-9",
diff --git a/meta/main.yml b/meta/main.yml
index 0c68fe9..afc37a9 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -14,6 +14,7 @@ galaxy_info:
         - xenial
         - bionic
         - focal
+        - jammy
     - name: Debian
       versions:
         - stretch
diff --git a/vars/_jammy.yml b/vars/_jammy.yml
new file mode 100644
index 0000000..b6dc230
--- /dev/null
+++ b/vars/_jammy.yml
@@ -0,0 +1,3 @@
+# vars file
+---
+rstudio_server_download_url: "https://download2.rstudio.org/server/jammy/{{ ansible_machine }}/rstudio-server-{{ rstudio_server_version }}-{{ rstudio_server_machine_map[ansible_machine] }}.deb"

From e54485ae7172479890fe3a0bb3e966858bf6e28c Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Thu, 1 Jun 2023 11:10:47 +0200
Subject: [PATCH 2/2] Fix failing test

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

diff --git a/vars/_jammy.yml b/vars/_jammy.yml
index b6dc230..168d05d 100644
--- a/vars/_jammy.yml
+++ b/vars/_jammy.yml
@@ -1,3 +1,3 @@
 # vars file
 ---
-rstudio_server_download_url: "https://download2.rstudio.org/server/jammy/{{ ansible_machine }}/rstudio-server-{{ rstudio_server_version }}-{{ rstudio_server_machine_map[ansible_machine] }}.deb"
+rstudio_server_download_url: "https://download2.rstudio.org/server/jammy/{{ rstudio_server_machine_map[ansible_machine] }}/rstudio-server-{{ rstudio_server_version }}-{{ rstudio_server_machine_map[ansible_machine] }}.deb"