diff --git a/roles/moodle/tasks/nginx.yml b/roles/moodle/tasks/enable-or-disable.yml
similarity index 53%
rename from roles/moodle/tasks/nginx.yml
rename to roles/moodle/tasks/enable-or-disable.yml
index 65a8eef08..687d6db1e 100644
--- a/roles/moodle/tasks/nginx.yml
+++ b/roles/moodle/tasks/enable-or-disable.yml
@@ -1,3 +1,18 @@
+- name: "Set 'postgresql_install: True' and 'postgresql_enabled: True'"
+  set_fact:
+    postgresql_install: True
+    postgresql_enabled: True    # Revert just below if...
+
+- name: "Set 'postgresql_enabled: False' if not moodle_enabled"
+  set_fact:
+    postgresql_enabled: False
+  when: not moodle_enabled    # and not (pathagar_enabled is defined and pathagar_enabled)
+
+- name: POSTGRESQL - run 'postgresql' role (Enable&Start or Disable&Stop PostgreSQL)
+  include_role:
+    name: postgresql
+
+
 - name: Enable http://box/moodle via NGINX, by installing {{ nginx_conf_dir }}/moodle-nginx.conf from template
   template:
     src: moodle-nginx.conf.j2
diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml
index 5c4e6bf73..56289248c 100644
--- a/roles/moodle/tasks/main.yml
+++ b/roles/moodle/tasks/main.yml
@@ -24,23 +24,7 @@
   when: moodle_installed is undefined
 
 
-- name: "Set 'postgresql_install: True' and 'postgresql_enabled: True'"
-  set_fact:
-    postgresql_install: True
-    postgresql_enabled: True    # Revert just below if...
-
-- name: "Set 'postgresql_enabled: False' if not moodle_enabled"
-  set_fact:
-    postgresql_enabled: False
-  when: not moodle_enabled    # and not (pathagar_enabled is defined and pathagar_enabled)
-
-- name: POSTGRESQL - run 'postgresql' role (Enable&Start or Disable&Stop PostgreSQL)
-  include_role:
-    name: postgresql
-
-
-- name: Enable/Disable/Restart NGINX
-  include_tasks: nginx.yml
+- include_tasks: enable-or-disable.yml
 
 
 - name: Add 'moodle' variable values to {{ iiab_ini_file }}