fix: update R task from connect role to match workbench one

Appsilon · Oct 12, 2021 · e45ddcf · e45ddcf
1 parent 58e215f
commit e45ddcf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/tasks/install-r.yml b/tasks/install-r.yml
@@ -2,16 +2,16 @@
 
 - name: install | r-version (download)
   get_url:
-    url: "{{ r_download_url }}/r-{{ item }}_1_{{ rstudio_connect_machine_map[ansible_machine] }}.deb"
-    dest: "{{ rstudio_connect_downloads_path }}/r-{{ item }}_1_amd64.deb"
+    url: "{{ r_download_url }}/r-{{ item }}_1_{{ rstudio_workbench_machine_map[ansible_machine] }}.deb"
+    dest: "{{ rstudio_workbench_downloads_path }}/r-{{ item }}_1_amd64.deb"
   loop: "{{ r_versions }}"
   tags:
     - r-version-install
   when: r_versions is defined
 
 - name: install | r-version
   apt:
-    deb: "{{ rstudio_connect_downloads_path }}/r-{{ item }}_1_amd64.deb"
+    deb: "{{ rstudio_workbench_downloads_path }}/r-{{ item }}_1_amd64.deb"
   loop: "{{ r_versions }}"
   tags:
     - r-version-install

diff --git a/vars/_focal.yml b/vars/_focal.yml
@@ -1,3 +1,4 @@
 # vars file
 ---
 rstudio_workbench_download_url: "https://download2.rstudio.org/server/bionic/{{ rstudio_workbench_machine_map[ansible_machine] }}/rstudio-workbench-{{ rstudio_workbench_version }}-{{ rstudio_workbench_machine_map[ansible_machine] }}.deb"
+r_download_url: "https://cdn.rstudio.com/r/ubuntu-{{ ansible_lsb.release|replace('.','') }}/pkgs"