Update the 'debops.rstudio_server' playbook

debops · Oct 18, 2017 · fb04a87 · fb04a87
1 parent 2bfd144
commit fb04a87
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -207,6 +207,8 @@ Changed
 - Update the ``profile_tasks.py`` callback to work correctly on Ansible 2.4.
   [drybjed_]
 
+- Update the debops.rstudio_server_ playbook. [drybjed_]
+
 Deprecated
 ~~~~~~~~~~
 

diff --git a/playbooks/service/cran.yml b/playbooks/service/cran.yml
@@ -18,6 +18,7 @@
               if cran__java_integration|bool else [] }}'
 
     - role: debops.java
+      tags: [ 'role::java' ]
       java__install_jdk: True
       when: cran__java_integration|bool
 

diff --git a/playbooks/service/rstudio_server.yml b/playbooks/service/rstudio_server.yml
@@ -1,7 +1,7 @@
 ---
 
-- name: Manage RStudio Server
+- name: Manage RStudio Server service
-  hosts: [ 'debops_service_rstudio_server', 'debops_rstudio_server' ]
+  hosts: [ 'debops_service_rstudio_server' ]
   become: True
 
   environment: '{{ inventory__environment | d({})
@@ -10,6 +10,38 @@
 
   roles:
 
+    - role: debops.etc_services
+      tags: [ 'role::etc_services' ]
+      etc_services__dependent_list:
+        - '{{ rstudio_server__etc_services__dependent_list }}'
+
+    - role: debops.apt_preferences
+      tags: [ 'role::apt_preferences' ]
+      apt_preferences__dependent_list:
+        - '{{ nginx__apt_preferences__dependent_list }}'
+        - '{{ cran__apt_preferences__dependent_list }}'
+        - '{{ java__apt_preferences__dependent_list
+              if cran__java_integration|bool else [] }}'
+
+    - role: debops.ferm
+      tags: [ 'role::ferm' ]
+      ferm__dependent_rules:
+        - '{{ nginx__ferm__dependent_rules }}'
+
+    - role: debops.nginx
+      tags: [ 'role::nginx' ]
+      nginx__dependent_servers:
+        - '{{ rstudio_server__nginx__dependent_servers }}'
+
+    - role: debops.java
+      tags: [ 'role::java' ]
+      java__install_jdk: True
+      when: cran__java_integration|bool
+
+    - role: debops.cran
+      tags: [ 'role::cran' ]
+      cran__dependent_packages:
+        - '{{ rstudio_server__cran__dependent_packages }}'
+
     - role: debops.rstudio_server
       tags: [ 'role::rstudio_server' ]
-