diff --git a/.travis.yml b/.travis.yml index c63f0dd..5f3c8d9 100644 --- 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 index d02b870..ee96b3f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ ## rstudio -[![Build Status](https://travis-ci.org/Oefenweb/ansible-rstudio.svg?branch=master)](https://travis-ci.org/Oefenweb/ansible-rstudio) [![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-rstudio-blue.svg)](https://galaxy.ansible.com/Oefenweb/rstudio/) +[![Build Status](https://travis-ci.org/Oefenweb/ansible-rstudio.svg?branch=master)](https://travis-ci.org/Oefenweb/ansible-rstudio) +[![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-rstudio-blue.svg)](https://galaxy.ansible.com/Oefenweb/rstudio/) Set up (the latest version of) [RStudio (IDE)](https://www.rstudio.com/products/rstudio/download/) in Debian-like systems. @@ -11,7 +12,7 @@ Set up (the latest version of) [RStudio (IDE)](https://www.rstudio.com/products/ #### Variables -* `rstudio_version` [default: `1.1.463`]: Version to install +* `rstudio_version` [default: `1.2.5033`]: Version to install * `rstudio_install` [default: `[]`]: Additional packages to install (e.g. `r-base`) ## Dependencies diff --git a/Vagrantfile b/Vagrantfile index ad8dddf..0a0d24c 100644 --- 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 index 7319836..f7f95dd 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,4 +1,4 @@ # defaults file for rstudio --- -rstudio_version: 1.1.463 +rstudio_version: 1.2.5033 rstudio_install: [] diff --git a/meta/main.yml b/meta/main.yml index fbf9043..e229890 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -10,7 +10,6 @@ galaxy_info: platforms: - name: Ubuntu versions: - - precise - trusty - xenial - bionic @@ -18,6 +17,7 @@ galaxy_info: versions: - jessie - stretch + - buster galaxy_tags: - development - system diff --git a/tasks/install.yml b/tasks/install.yml index 880521d..ad12c45 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -29,8 +29,8 @@ - name: install | download deb command: > - curl -sSL - https://download1.rstudio.org/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb + curl --silent --show-error --fail --location + {{ rstudio_download_url }} -o {{ rstudio_downloads_path }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb args: creates: "{{ rstudio_downloads_path }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb" diff --git a/tasks/main.yml b/tasks/main.yml index 9adc5ce..ddfa989 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,5 +1,16 @@ # tasks file for rstudio --- +- name: include variables + include_vars: "{{ item }}" + with_first_found: + - "_{{ ansible_distribution_release }}.yml" + - "_{{ ansible_distribution | lower }}.yml" + - _default.yml + tags: + - configuration + - rstudio + - rstudio-include-variables + - include: install.yml tags: - configuration diff --git a/vars/_buster.yml b/vars/_buster.yml new file mode 100644 index 0000000..844a78b --- /dev/null +++ b/vars/_buster.yml @@ -0,0 +1,3 @@ +# vars file for rstudio +--- +rstudio_download_url: "https://download1.rstudio.org/desktop/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb" diff --git a/vars/_jessie.yml b/vars/_jessie.yml new file mode 100644 index 0000000..a748fa1 --- /dev/null +++ b/vars/_jessie.yml @@ -0,0 +1,3 @@ +# vars file for rstudio +--- +rstudio_download_url: "https://download1.rstudio.org/desktop/trusty/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb" diff --git a/vars/_stretch.yml b/vars/_stretch.yml new file mode 100644 index 0000000..202078d --- /dev/null +++ b/vars/_stretch.yml @@ -0,0 +1,3 @@ +# vars file for rstudio +--- +rstudio_download_url: "https://download1.rstudio.org/desktop/debian9/{{ ansible_machine }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb" diff --git a/vars/_ubuntu.yml b/vars/_ubuntu.yml new file mode 100644 index 0000000..79b994e --- /dev/null +++ b/vars/_ubuntu.yml @@ -0,0 +1,3 @@ +# vars file for rstudio +--- +rstudio_download_url: "https://download1.rstudio.org/desktop/{{ ansible_distribution_release }}/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"