Merge pull request #13 from Oefenweb/upgrade-to-v2

Upgrade to 2022.*
Oefenweb · May 10, 2022 · 3e17c31 · 3e17c31
2 parents 2ad0454 + fce2ce8
commit 3e17c31
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Set up (the latest version of) [RStudio (IDE)](https://www.rstudio.com/products/
 
 #### Variables
 
-* `rstudio_version` [default: `1.4.1717`, `1.2.5042` for `Debian 8`]: Version to install
+* `rstudio_version` [default: `2022.02.2-485`]: Version to install
 * `rstudio_install` [default: `[]`]: Additional packages to install (e.g. `r-base`)
 
 ## Dependencies

diff --git a/Vagrantfile b/Vagrantfile
@@ -4,13 +4,6 @@
 role = File.basename(File.expand_path(File.dirname(__FILE__)))
 
 boxes = [
-  {
-    :name => "ubuntu-1604",
-    :box => "bento/ubuntu-16.04",
-    :ip => '10.0.0.12',
-    :cpu => "50",
-    :ram => "256"
-  },
   {
     :name => "ubuntu-1804",
     :box => "bento/ubuntu-18.04",
@@ -25,13 +18,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
@@ -1,4 +1,4 @@
 # defaults file
 ---
-rstudio_version: "{{ '1.2.5042' if ansible_distribution == 'Debian' and ansible_distribution_version is version('9', '<') else '1.4.1717' }}"
+rstudio_version: '2022.02.2-485'
 rstudio_install: []
diff --git a/meta/main.yml b/meta/main.yml
@@ -11,12 +11,10 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - xenial
         - bionic
         - focal
     - name: Debian
       versions:
-        - jessie
         - stretch
         - buster
   galaxy_tags:

diff --git a/vars/_buster.yml → vars/_default.yml b/vars/_buster.yml → vars/_default.yml
diff --git a/vars/_focal.yml b/vars/_focal.yml
diff --git a/vars/_jessie.yml b/vars/_jessie.yml
diff --git a/vars/_ubuntu.yml b/vars/_ubuntu.yml