Merge pull request #9 from Oefenweb/ANSPB-394-upgrade-r-and-r-studio-…

…to-rece Upgrade R-studio to recent version
Oefenweb · Feb 27, 2020 · 3c54b4c · 3c54b4c
2 parents 328f059 + 59ffbae
commit 3c54b4c
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 ---
 sudo: required
-dist: trusty
+dist: xenial
 
 language: python
 python: "2.7"

diff --git 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.1.463`]: Version to install
+* `rstudio_server_version` [default: `1.2.5033`]: 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
@@ -4,13 +4,6 @@
 role = File.basename(File.expand_path(File.dirname(__FILE__)))
 
 boxes = [
-  {
-    :name => "ubuntu-1204",
-    :box => "bento/ubuntu-12.04",
-    :ip => '10.0.0.11',
-    :cpu => "50",
-    :ram => "256"
-  },
   {
     :name => "ubuntu-1404",
     :box => "bento/ubuntu-14.04",
@@ -46,6 +39,13 @@ boxes = [
     :cpu => "50",
     :ram => "256"
   },
+  {
+    :name => "debian-10",
+    :box => "bento/debian-10",
+    :ip => '10.0.0.18',
+    :cpu => "50",
+    :ram => "256"
+  },
 ]
 
 Vagrant.configure("2") do |config|

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,6 +1,6 @@
 # defaults file for rstudio-server
 ---
-rstudio_server_version: 1.1.463
+rstudio_server_version: 1.2.5033
 rstudio_server_install: []
 
 rstudio_server_www_port: 8787

diff --git a/meta/main.yml b/meta/main.yml
@@ -10,14 +10,14 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - precise
         - trusty
         - xenial
         - bionic
     - name: Debian
       versions:
         - jessie
         - stretch
+        - buster
   galaxy_tags:
     - development
     - system

diff --git a/tasks/install.yml b/tasks/install.yml
@@ -29,19 +29,19 @@
 
 - name: install | download deb
   command: >
-    curl -sSL
-    https://download2.rstudio.org/rstudio-server-{{ rstudio_server_version }}-{{ rstudio_server_machine_map[ansible_machine] }}.deb
-    -o {{ rstudio_server_downloads_path }}/rstudio-server_{{ rstudio_server_version }}_{{ rstudio_server_machine_map[ansible_machine] }}.deb
+    curl --silent --show-error --fail --location
+    {{ rstudio_server_download_url }}
+    -o {{ rstudio_server_downloads_path }}/rstudio-server-{{ rstudio_server_version }}-{{ rstudio_server_machine_map[ansible_machine] }}.deb
   args:
-    creates: "{{ rstudio_server_downloads_path }}/rstudio-server_{{ rstudio_server_version }}_{{ rstudio_server_machine_map[ansible_machine] }}.deb"
+    creates: "{{ rstudio_server_downloads_path }}/rstudio-server-{{ rstudio_server_version }}-{{ rstudio_server_machine_map[ansible_machine] }}.deb"
     warn: false
   tags:
     - rstudio-server-install-download
     - rstudio-server-install-download-deb
 
 - name: install | install deb
   apt:
-    deb: "{{ rstudio_server_downloads_path }}/rstudio-server_{{ rstudio_server_version }}_{{ rstudio_server_machine_map[ansible_machine] }}.deb"
+    deb: "{{ rstudio_server_downloads_path }}/rstudio-server-{{ rstudio_server_version }}-{{ rstudio_server_machine_map[ansible_machine] }}.deb"
   tags:
     - rstudio-server-install-install
     - rstudio-server-install-install-deb
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,5 +1,16 @@
 # tasks file for rstudio-server
 ---
+- name: include variables
+  include_vars: "{{ item }}"
+  with_first_found:
+    - "_{{ ansible_distribution_release }}.yml"
+    - "_{{ ansible_distribution | lower }}.yml"
+    - _default.yml
+  tags:
+   - configuration
+   - rstudio-server
+   - rstudio-server-include-variables
+
 - include: install.yml
   tags:
    - configuration

diff --git a/vars/_buster.yml b/vars/_buster.yml
@@ -0,0 +1,3 @@
+# vars file for rstudio-server
+---
+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
@@ -0,0 +1,3 @@
+# vars file for rstudio-server
+---
+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/_stretch.yml b/vars/_stretch.yml
@@ -0,0 +1,3 @@
+# vars file for rstudio-server
+---
+rstudio_server_download_url: "https://download2.rstudio.org/server/debian9/{{ ansible_machine }}/rstudio-server-{{ rstudio_server_version }}-{{ rstudio_server_machine_map[ansible_machine] }}.deb"
diff --git a/vars/_ubuntu.yml b/vars/_ubuntu.yml
@@ -0,0 +1,3 @@
+# vars file for rstudio-server
+---
+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"
diff --git a/vars/_xenial.yml b/vars/_xenial.yml
@@ -0,0 +1,3 @@
+# vars file for rstudio-server
+---
+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"