diff --git a/Dockerfile b/Dockerfile index fc89ab2..b179278 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ MAINTAINER Mischa ter Smitten RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y python-minimal python-dev curl && \ apt-get clean -RUN curl -sL https://bootstrap.pypa.io/get-pip.py | python - +RUN curl -sL https://bootstrap.pypa.io/pip/2.7/get-pip.py | python - RUN rm -rf $HOME/.cache # ansible diff --git a/defaults/main.yml b/defaults/main.yml index 9a802eb..7f60adb 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,4 +1,4 @@ -# defaults file for rstudio +# defaults file --- rstudio_version: "{{ '1.2.5042' if ansible_distribution == 'Debian' and ansible_distribution_version is version('9', '<') else '1.4.1103' }}" rstudio_install: [] diff --git a/handlers/main.yml b/handlers/main.yml index dfd1fa2..43d6a9a 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,2 +1,2 @@ -# handlers file for rstudio +# handlers file --- diff --git a/meta/main.yml b/meta/main.yml index c5c9bb2..c05b208 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,6 +1,7 @@ -# meta file for rstudio +# meta file --- galaxy_info: + namespace: oefenweb role_name: rstudio author: Mischa ter Smitten company: Oefenweb.nl B.V. diff --git a/tasks/install.yml b/tasks/install.yml index ad12c45..0687d0a 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -1,4 +1,4 @@ -# tasks file for rstudio +# tasks file --- - name: install | dependencies apt: diff --git a/tasks/main.yml b/tasks/main.yml index ea6c35f..fb84787 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,4 +1,4 @@ -# tasks file for rstudio +# tasks file --- - name: include variables include_vars: "{{ item }}" diff --git a/tests/test.yml b/tests/test.yml index 0416e51..c2fbb9f 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -1,4 +1,4 @@ -# test file for rstudio +# test file --- - hosts: localhost connection: local diff --git a/tests/vagrant.yml b/tests/vagrant.yml index f25188f..3808922 100644 --- a/tests/vagrant.yml +++ b/tests/vagrant.yml @@ -1,4 +1,4 @@ -# test file for rstudio +# test file --- - hosts: all remote_user: vagrant diff --git a/tests/vars/main.yml b/tests/vars/main.yml index fe66b18..095b0f2 100644 --- a/tests/vars/main.yml +++ b/tests/vars/main.yml @@ -1,4 +1,4 @@ -# vars file for rstudio +# vars file --- rstudio_install: - r-base diff --git a/vars/_buster.yml b/vars/_buster.yml index 844a78b..c729b5b 100644 --- a/vars/_buster.yml +++ b/vars/_buster.yml @@ -1,3 +1,3 @@ -# vars file for rstudio +# vars file --- 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/_focal.yml b/vars/_focal.yml index 844a78b..c729b5b 100644 --- a/vars/_focal.yml +++ b/vars/_focal.yml @@ -1,3 +1,3 @@ -# vars file for rstudio +# vars file --- 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 index a748fa1..f562089 100644 --- a/vars/_jessie.yml +++ b/vars/_jessie.yml @@ -1,3 +1,3 @@ -# vars file for rstudio +# vars file --- 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 index 202078d..e09861c 100644 --- a/vars/_stretch.yml +++ b/vars/_stretch.yml @@ -1,3 +1,3 @@ -# vars file for rstudio +# vars file --- 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 index 79b994e..430f24d 100644 --- a/vars/_ubuntu.yml +++ b/vars/_ubuntu.yml @@ -1,3 +1,3 @@ -# vars file for rstudio +# vars file --- 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" diff --git a/vars/main.yml b/vars/main.yml index 3502dfc..d615a69 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,4 +1,4 @@ -# vars file for rstudio +# vars file --- rstudio_dependencies: - curl