#8 move ruleset installation to config role, remove from server_confi…

…g.json template

ansible/roles/irods-config/tasks/main.yaml

@@ -1,5 +1,38 @@
 ---
 
+# drop in DE rulesets
+
+- name: copy in DE core.re
+  sudo: yes
+  sudo_user: irods
+  copy: src=core.re dest=/etc/irods/ owner=irods group=irods mode=0644
+
+- name: copy in DE ipc-amqp.re
+  sudo: yes
+  sudo_user: irods
+  copy: src=ipc-amqp.re dest=/etc/irods/ owner=irods group=irods mode=0644
+
+- name: copy in DE ipc-custom.re
+  sudo: yes
+  sudo_user: irods
+  copy: src=ipc-custom.re dest=/etc/irods/ owner=irods group=irods mode=0644
+
+- name: copy in DE ipc-env.re
+  sudo: yes
+  sudo_user: irods
+  copy: src=ipc-env.re dest=/etc/irods/ owner=irods group=irods mode=0644
+
+- name: copy in DE ipc-json.re
+  sudo: yes
+  sudo_user: irods
+  copy: src=ipc-json.re dest=/etc/irods/ owner=irods group=irods mode=0644
+
+- name: copy in DE ipc-logic.re
+  copy: src=ipc-logic.re dest=/etc/irods/ owner=irods group=irods mode=0644
+
+- name: copy in DE ipc-uuid.re
+  copy: src=ipc-uuid.re dest=/etc/irods/ owner=irods group=irods mode=0644
+
 # ignore_errors in case user is like don and picks 'rodsadmin' as an admin name
 - name: create DE/services irods user
   sudo: yes
@@ -53,3 +86,6 @@
   sudo: yes
   sudo_user: irods
   shell: "ichmod inherit /{{ irods_zone }}/trash"
+
+- name: echo ruleset warning
+  debug: msg="Custom DE iRODS rulebases installed, including core.re. Please activate rules as needed by adding them to /etc/irods/server_config.json beneath re_rulebase_set."

ansible/roles/irods/tasks/main.yml

@@ -157,38 +157,38 @@
   sudo_user: root
   template: src=server_config.json.j2 dest=/etc/irods/server_config.json owner=irods group=irods mode=0644
 
-- name: copy in DE core.re
-  sudo: yes
-  sudo_user: irods
-  copy: src=core.re dest=/etc/irods/ owner=irods group=irods mode=0644
-
-- name: copy in DE ipc-amqp.re
-  sudo: yes
-  sudo_user: irods
-  copy: src=ipc-amqp.re dest=/etc/irods/ owner=irods group=irods mode=0644
-
-- name: copy in DE ipc-custom.re
-  sudo: yes
-  sudo_user: irods
-  copy: src=ipc-custom.re dest=/etc/irods/ owner=irods group=irods mode=0644
-
-- name: copy in DE ipc-env.re
-  sudo: yes
-  sudo_user: irods
-  copy: src=ipc-env.re dest=/etc/irods/ owner=irods group=irods mode=0644
-
-- name: copy in DE ipc-json.re
-  sudo: yes
-  sudo_user: irods
-  copy: src=ipc-json.re dest=/etc/irods/ owner=irods group=irods mode=0644
-
-- name: copy in DE ipc-logic.re
-  copy: src=ipc-logic.re dest=/etc/irods/ owner=irods group=irods mode=0644
-
-- name: copy in DE ipc-uuid.re
-  copy: src=ipc-uuid.re dest=/etc/irods/ owner=irods group=irods mode=0644
+### move rule installation to irods-config role ###
+#- name: copy in DE core.re
+#  sudo: yes
+#  sudo_user: irods
+#  copy: src=core.re dest=/etc/irods/ owner=irods group=irods mode=0644
+#
+#- name: copy in DE ipc-amqp.re
+#  sudo: yes
+#  sudo_user: irods
+#  copy: src=ipc-amqp.re dest=/etc/irods/ owner=irods group=irods mode=0644
+#
+#- name: copy in DE ipc-custom.re
+#  sudo: yes
+#  sudo_user: irods
+#  copy: src=ipc-custom.re dest=/etc/irods/ owner=irods group=irods mode=0644
+#
+#- name: copy in DE ipc-env.re
+#  sudo: yes
+#  sudo_user: irods
+#  copy: src=ipc-env.re dest=/etc/irods/ owner=irods group=irods mode=0644
+#
+#- name: copy in DE ipc-json.re
+#  sudo: yes
+#  sudo_user: irods
+#  copy: src=ipc-json.re dest=/etc/irods/ owner=irods group=irods mode=0644
+#
+#- name: copy in DE ipc-logic.re
+#  copy: src=ipc-logic.re dest=/etc/irods/ owner=irods group=irods mode=0644
+#
+#- name: copy in DE ipc-uuid.re
+#  copy: src=ipc-uuid.re dest=/etc/irods/ owner=irods group=irods mode=0644
 
 # systemctl call errors out, use init.d instead
 - name: restart irods service
   shell: "/etc/init.d/irods restart"
-

ansible/roles/irods/templates/server_config.json.j2

@@ -29,12 +29,6 @@
         }
     ], 
     "re_rulebase_set": [
-        {
-            "filename": "ipc-custom"
-        }, 
-	{
-	    "filename": "ipc-uuid"
-	},
         {
             "filename": "core"
         }