Skip to content

Commit fb04a87

Browse files
committed
Update the 'debops.rstudio_server' playbook
1 parent 2bfd144 commit fb04a87

3 files changed

Lines changed: 38 additions & 3 deletions

File tree

CHANGES.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,8 @@ Changed
207207
- Update the ``profile_tasks.py`` callback to work correctly on Ansible 2.4.
208208
[drybjed_]
209209

210+
- Update the debops.rstudio_server_ playbook. [drybjed_]
211+
210212
Deprecated
211213
~~~~~~~~~~
212214

playbooks/service/cran.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
if cran__java_integration|bool else [] }}'
1919

2020
- role: debops.java
21+
tags: [ 'role::java' ]
2122
java__install_jdk: True
2223
when: cran__java_integration|bool
2324

playbooks/service/rstudio_server.yml

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

3-
- name: Manage RStudio Server
4-
hosts: [ 'debops_service_rstudio_server', 'debops_rstudio_server' ]
3+
- name: Manage RStudio Server service
4+
hosts: [ 'debops_service_rstudio_server' ]
55
become: True
66

77
environment: '{{ inventory__environment | d({})
@@ -10,6 +10,38 @@
1010

1111
roles:
1212

13+
- role: debops.etc_services
14+
tags: [ 'role::etc_services' ]
15+
etc_services__dependent_list:
16+
- '{{ rstudio_server__etc_services__dependent_list }}'
17+
18+
- role: debops.apt_preferences
19+
tags: [ 'role::apt_preferences' ]
20+
apt_preferences__dependent_list:
21+
- '{{ nginx__apt_preferences__dependent_list }}'
22+
- '{{ cran__apt_preferences__dependent_list }}'
23+
- '{{ java__apt_preferences__dependent_list
24+
if cran__java_integration|bool else [] }}'
25+
26+
- role: debops.ferm
27+
tags: [ 'role::ferm' ]
28+
ferm__dependent_rules:
29+
- '{{ nginx__ferm__dependent_rules }}'
30+
31+
- role: debops.nginx
32+
tags: [ 'role::nginx' ]
33+
nginx__dependent_servers:
34+
- '{{ rstudio_server__nginx__dependent_servers }}'
35+
36+
- role: debops.java
37+
tags: [ 'role::java' ]
38+
java__install_jdk: True
39+
when: cran__java_integration|bool
40+
41+
- role: debops.cran
42+
tags: [ 'role::cran' ]
43+
cran__dependent_packages:
44+
- '{{ rstudio_server__cran__dependent_packages }}'
45+
1346
- role: debops.rstudio_server
1447
tags: [ 'role::rstudio_server' ]
15-

0 commit comments

Comments
 (0)