diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml index f9369d65d..7072c2ab4 100644 --- a/roles/0-init/tasks/main.yml +++ b/roles/0-init/tasks/main.yml @@ -135,12 +135,6 @@ # mongodb_enabled: True # when: sugarizer_enabled | bool -# There might be other db's -- name: Turn on both vars for PostgreSQL if moodle_enabled or pathagar_enabled - set_fact: - postgresql_install: True - postgresql_enabled: True - when: moodle_enabled or (pathagar_enabled is defined and pathagar_enabled) #- name: Turn on vars for Docker if SchoolTool is to be installed # set_fact: diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml index 0ce4d852e..cc13246e8 100644 --- a/roles/4-server-options/tasks/main.yml +++ b/roles/4-server-options/tasks/main.yml @@ -48,11 +48,11 @@ # has no "when: XXXXX_install" flag #tags: base, homepage -- name: POSTGRESQL - include_role: - name: postgresql - when: postgresql_install | bool - #tags: postgresql, pathagar, moodle +#- name: POSTGRESQL +# include_role: +# name: postgresql +# when: postgresql_install | bool +# tags: postgresql, pathagar, moodle - name: CUPS include_role: diff --git a/roles/moodle/tasks/enable.yml b/roles/moodle/tasks/enable.yml index 755721436..474c407f7 100644 --- a/roles/moodle/tasks/enable.yml +++ b/roles/moodle/tasks/enable.yml @@ -1,3 +1,18 @@ +- name: Enable postgresql-iiab service when moodle_enabled + systemd: + name: postgresql-iiab + state: started + enabled: yes + when: moodle_enabled + +# if the only service using the backend db disable if not running +- name: Disable postgresql-iiab service when not moodle_enabled + systemd: + name: postgresql-iiab + state: stopped + enabled: no + when: not moodle_enabled and not (pathagar_enabled is defined and pathagar_enabled) + # Apache - name: Enable http://box/moodle via Apache diff --git a/roles/moodle/tasks/install.yml b/roles/moodle/tasks/install.yml index 059c56d42..fe212a804 100644 --- a/roles/moodle/tasks/install.yml +++ b/roles/moodle/tasks/install.yml @@ -1,3 +1,12 @@ +- name: Turn on enabled vars for PostgreSQL + set_fact: + postgresql_install: True + postgresql_enabled: True + +- name: POSTGRESQL + include_role: + name: postgresql + - name: "Install packages: python-psycopg2, php-pgsql (OS's other than debuntu)" package: name: diff --git a/roles/pathagar/tasks/main.yml b/roles/pathagar/tasks/main.yml index 968762383..b1f17af72 100644 --- a/roles/pathagar/tasks/main.yml +++ b/roles/pathagar/tasks/main.yml @@ -1,3 +1,12 @@ +- name: Turn on enabled vars for PostgreSQL + set_fact: + postgresql_install: True + postgresql_enabled: True + +- name: POSTGRESQL + include_role: + name: postgresql + - name: Remove package Pathagar (in case rpm?) package: name: pathagar @@ -93,6 +102,8 @@ service: name: postgresql-iiab state: started + enabled: yes + when: pathagar_enabled - name: Enable Pathagar postgresql user access by md5 method lineinfile: @@ -193,6 +204,15 @@ name: "{{ apache_service }}" state: reloaded +# if the only service using the backend db disable if not running +- name: Disable postgresql-iiab service when not pathagar_enabled + systemd: + name: postgresql-iiab + state: stopped + enabled: no + when: not moodle_enabled and not pathagar_enabled + + - name: Add 'pathagar' variable values to {{ iiab_ini_file }} ini_file: path: "{{ iiab_ini_file }}"