From 5df4b61b88bf705201793d4752f92f550e2860c2 Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Tue, 10 May 2022 11:14:27 +0200
Subject: [PATCH] Upgrade to v2

---
 README.md                          | 2 +-
 Vagrantfile                        | 7 -------
 defaults/main.yml                  | 2 +-
 meta/main.yml                      | 1 -
 vars/{_buster.yml => _default.yml} | 0
 vars/_focal.yml                    | 3 ---
 vars/_jessie.yml                   | 4 ----
 vars/_ubuntu.yml                   | 3 ---
 8 files changed, 2 insertions(+), 20 deletions(-)
 rename vars/{_buster.yml => _default.yml} (100%)
 delete mode 100644 vars/_focal.yml
 delete mode 100644 vars/_jessie.yml
 delete mode 100644 vars/_ubuntu.yml

diff --git a/README.md b/README.md
index 1ef1b32..5e59af6 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Set up (the latest version of) [RStudio Server](https://www.rstudio.com/products
 
 #### Variables
 
-* `rstudio_server_version` [default: `1.4.1717`, `1.2.5042` for `Debian 8`]: Version to install
+* `rstudio_server_version` [default: `2022.02.2-485`]: Version to install
 * `rstudio_server_install` [default: `[]`]: Additional packages to install (e.g. `r-base`)
 
 * `rstudio_server_www_port` [default: `8787`]: The port you want RStudio to listen on
diff --git a/Vagrantfile b/Vagrantfile
index a0182a0..a72df5b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -25,13 +25,6 @@ boxes = [
     :cpu => "50",
     :ram => "384"
   },
-  {
-    :name => "debian-8",
-    :box => "bento/debian-8",
-    :ip => '10.0.0.16',
-    :cpu => "50",
-    :ram => "256"
-  },
   {
     :name => "debian-9",
     :box => "bento/debian-9",
diff --git a/defaults/main.yml b/defaults/main.yml
index 5fe0f6e..261b146 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,6 @@
 # defaults file
 ---
-rstudio_server_version: "{{ '1.2.5042' if ansible_distribution == 'Debian' and ansible_distribution_version is version('9', '<') else '1.4.1717' }}"
+rstudio_server_version: '2022.02.2-485'
 rstudio_server_install: []
 
 rstudio_server_www_port: 8787
diff --git a/meta/main.yml b/meta/main.yml
index eadf14d..c948475 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -16,7 +16,6 @@ galaxy_info:
         - focal
     - name: Debian
       versions:
-        - jessie
         - stretch
         - buster
   galaxy_tags:
diff --git a/vars/_buster.yml b/vars/_default.yml
similarity index 100%
rename from vars/_buster.yml
rename to vars/_default.yml
diff --git a/vars/_focal.yml b/vars/_focal.yml
deleted file mode 100644
index e51f301..0000000
--- a/vars/_focal.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-# vars file
----
-rstudio_server_download_url: "https://download2.rstudio.org/server/bionic/{{ rstudio_server_machine_map[ansible_machine] }}/rstudio-server-{{ rstudio_server_version }}-{{ rstudio_server_machine_map[ansible_machine] }}.deb"
diff --git a/vars/_jessie.yml b/vars/_jessie.yml
deleted file mode 100644
index d52b121..0000000
--- a/vars/_jessie.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-# vars file
----
-# trusty -> xenial for later versions
-rstudio_server_download_url: "https://download2.rstudio.org/server/trusty/{{ rstudio_server_machine_map[ansible_machine] }}/rstudio-server-{{ rstudio_server_version }}-{{ rstudio_server_machine_map[ansible_machine] }}.deb"
diff --git a/vars/_ubuntu.yml b/vars/_ubuntu.yml
deleted file mode 100644
index f0a0427..0000000
--- a/vars/_ubuntu.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-# vars file
----
-rstudio_server_download_url: "https://download2.rstudio.org/server/{{ ansible_distribution_release }}/{{ rstudio_server_machine_map[ansible_machine] }}/rstudio-server-{{ rstudio_server_version }}-{{ rstudio_server_machine_map[ansible_machine] }}.deb"