From e6704006f47d211ea7afae8b169c36b14e68b471 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Jan 2020 23:07:10 -0500 Subject: [PATCH 01/14] Update moodle/tasks/enable.yml --- roles/moodle/tasks/enable.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/moodle/tasks/enable.yml b/roles/moodle/tasks/enable.yml index 474c407f7..cff768160 100644 --- a/roles/moodle/tasks/enable.yml +++ b/roles/moodle/tasks/enable.yml @@ -1,4 +1,4 @@ -- name: Enable postgresql-iiab service when moodle_enabled +- name: Enable 'postgresql-iiab' systemd service, if moodle_enabled systemd: name: postgresql-iiab state: started @@ -6,7 +6,7 @@ when: moodle_enabled # if the only service using the backend db disable if not running -- name: Disable postgresql-iiab service when not moodle_enabled +- name: Disable 'postgresql-iiab' systemd service, if not moodle_enabled systemd: name: postgresql-iiab state: stopped @@ -23,7 +23,7 @@ command: a2dissite 022-moodle.conf when: apache_install and not moodle_enabled -- name: Restart Apache systemd service ({{ apache_service }}) +- name: Restart '{{ apache_service }}' systemd service systemd: name: "{{ apache_service }}" # apache2 or httpd, as set in /opt/iiab/iiab/vars/.yml state: restarted From a7b9898ad6de0f5e1dbef69949857e04d5a4fd71 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Jan 2020 23:09:46 -0500 Subject: [PATCH 02/14] Update moodle/tasks/install.yml --- roles/moodle/tasks/install.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/moodle/tasks/install.yml b/roles/moodle/tasks/install.yml index fe212a804..0f02d0ac5 100644 --- a/roles/moodle/tasks/install.yml +++ b/roles/moodle/tasks/install.yml @@ -1,9 +1,9 @@ -- name: Turn on enabled vars for PostgreSQL +- name: "Set PostgreSQL vars 'postgresql_install: True' and 'postgresql_enabled: True'" set_fact: postgresql_install: True postgresql_enabled: True -- name: POSTGRESQL +- name: Run the 'postgresql' role include_role: name: postgresql From 228eb4e49cf629151460c1dbebc7057d9c1c4b21 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Jan 2020 23:13:26 -0500 Subject: [PATCH 03/14] Update nodered/tasks/install.yml --- roles/nodered/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nodered/tasks/install.yml b/roles/nodered/tasks/install.yml index 84873fc8c..a3a4a5a31 100644 --- a/roles/nodered/tasks/install.yml +++ b/roles/nodered/tasks/install.yml @@ -1,7 +1,7 @@ # 2019-01-16: @jvonau's PR #1403 moved installation of Node.js (8.x for now) & # npm to roles/nodejs/tasks/main.yml -- name: NODEJS +- name: Include role 'nodejs' include_role: name: nodejs # 2020-01-04 no longer triggered by roles/nodered/meta/main.yml From a63836ebe3a71a05e4b3b0ffc6ad0795f87b5325 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Jan 2020 23:14:28 -0500 Subject: [PATCH 04/14] Update install.yml --- roles/nodered/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nodered/tasks/install.yml b/roles/nodered/tasks/install.yml index a3a4a5a31..d67d8405f 100644 --- a/roles/nodered/tasks/install.yml +++ b/roles/nodered/tasks/install.yml @@ -1,7 +1,7 @@ # 2019-01-16: @jvonau's PR #1403 moved installation of Node.js (8.x for now) & # npm to roles/nodejs/tasks/main.yml -- name: Include role 'nodejs' +- name: Run the 'nodejs' role include_role: name: nodejs # 2020-01-04 no longer triggered by roles/nodered/meta/main.yml From 08af83119500a68bfa4cc4003949f25116a5f425 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Jan 2020 23:23:30 -0500 Subject: [PATCH 05/14] Update pathagar/tasks/main.yml --- roles/pathagar/tasks/main.yml | 54 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/roles/pathagar/tasks/main.yml b/roles/pathagar/tasks/main.yml index b1f17af72..4565e262b 100644 --- a/roles/pathagar/tasks/main.yml +++ b/roles/pathagar/tasks/main.yml @@ -1,9 +1,9 @@ -- name: Turn on enabled vars for PostgreSQL +- name: "Set PostgreSQL vars 'postgresql_install: True' and 'postgresql_enabled: True'" set_fact: postgresql_install: True postgresql_enabled: True -- name: POSTGRESQL +- name: Run the 'postgresql' role include_role: name: postgresql @@ -12,7 +12,7 @@ name: pathagar state: absent -- name: Install Pathagar prerequisites (all OSs) +- name: "Install Pathagar prerequisites: python-virtualenv, python-pip, python-psycopg2" package: name: "{{ item }}" state: present @@ -21,7 +21,7 @@ - python-pip - python-psycopg2 -- name: Install Pathagar prerequisites (debuntu) +- name: "Install Pathagar prerequisites: libapache2-mod-wsgi, libxml2-dev, libxslt-dev (debuntu)" package: name: "{{ item }}" state: present @@ -31,7 +31,7 @@ - libxslt-dev when: is_debuntu | bool -- name: Install Pathagar prerequisites (not debuntu) +- name: "Install Pathagar prerequisites: mod_wsgi, libxml2-devel, libxslt-devel (not debuntu)" package: name: "{{ item }}" state: present @@ -41,21 +41,21 @@ - libxslt-devel when: not is_debuntu -- name: Create destination folder +- name: "Create destination folder: {{ pathagar_src }}" file: path: "{{ pathagar_src }}" state: directory - owner: root - group: root - mode: 0755 + # owner: root + # group: root + # mode: '0755' -- name: Create books destination folder +- name: "Create books destination folder: {{ pathagar_media }}" file: path: "{{ pathagar_media }}" state: directory owner: "{{ apache_user }}" group: "{{ apache_user }}" - mode: 0755 + mode: '0755' - name: Determine if Pathagar has already been downloaded from git stat: @@ -98,8 +98,8 @@ become: yes become_user: postgres -- name: Start postgresql-iiab - service: +- name: Start 'postgresql-iiab' systemd service + systemd: name: postgresql-iiab state: started enabled: yes @@ -117,8 +117,8 @@ group: postgres register: enable_pathagar_md5_access -- name: Reload postgresql service - service: +- name: Reload 'postgresql-iiab' systemd service + systemd: name: postgresql-iiab state: reloaded when: enable_pathagar_md5_access.changed @@ -137,9 +137,9 @@ template: src: prod_settings.py dest: "{{ pathagar_src }}/prod_settings.py" - owner: root - group: root - mode: 0644 + # owner: root + # group: root + # mode: '0644' - name: Create Pathagar initial db django_manage: @@ -154,7 +154,7 @@ dest: "{{ pathagar_dir }}/auth.User.json" owner: root group: root - mode: 0600 + mode: '0600' - name: Load Pathagar admin user django_manage: @@ -175,37 +175,37 @@ template: src: wsgi.py dest: "{{ pathagar_dir }}/wsgi.py" - owner: root - group: root - mode: 0644 + # owner: root + # group: root + # mode: '0644' -- name: Install httpd conf for Pathagar +- name: Install /etc/{{ apache_config_dir }}/pathagar.conf from template template: src: pathagar.conf backup: yes dest: "/etc/{{ apache_config_dir }}/pathagar.conf" mode: 0644 -- name: Enable Pathagar (debuntu) +- name: Enable Pathagar via Apache (debuntu) file: path: /etc/apache2/sites-enabled/pathagar.conf src: /etc/apache2/sites-available/pathagar.conf state: link when: pathagar_enabled and is_debuntu -- name: Disable Pathagar (debuntu) +- name: Disable Pathagar via Apache (debuntu) file: path: /etc/apache2/sites-enabled/pathagar.conf state: absent when: not pathagar_enabled and is_debuntu -- name: Reload Apache ({{ apache_service }}) +- name: Reload '{{ apache_service }}' systemd service systemd: 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 +- name: Disable 'postgresql-iiab' systemd service, if not moodle_enabled and not pathagar_enabled systemd: name: postgresql-iiab state: stopped From 3177187988e43354c2b2b540ddb86432a9771ac5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Jan 2020 23:24:23 -0500 Subject: [PATCH 06/14] Update pbx/tasks/main.yml --- roles/pbx/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/pbx/tasks/main.yml b/roles/pbx/tasks/main.yml index d7f29acd1..eb2855ced 100644 --- a/roles/pbx/tasks/main.yml +++ b/roles/pbx/tasks/main.yml @@ -1,4 +1,4 @@ -- name: NODEJS +- name: Run the 'nodejs' role include_role: name: nodejs From 988858438b282edcd2bb27cbac237ddb7c651618 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Jan 2020 23:26:57 -0500 Subject: [PATCH 07/14] Update roles/sugarizer/tasks/enable.yml --- roles/sugarizer/tasks/enable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/sugarizer/tasks/enable.yml b/roles/sugarizer/tasks/enable.yml index d1e1ce4b8..e8b423540 100644 --- a/roles/sugarizer/tasks/enable.yml +++ b/roles/sugarizer/tasks/enable.yml @@ -16,7 +16,7 @@ when: not sugarizer_enabled # stops mongodb would of been called via meta/main.yml prior -- name: MONGODB +- name: Run mongodb/tasks/enable.yml to stop MongoDB, if not sugarizer_enabled include_tasks: roles/mongodb/tasks/enable.yml when: not sugarizer_enabled From 0e139cf0872f2eb69ec662cec07a11af7c86dccb Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Jan 2020 23:28:58 -0500 Subject: [PATCH 08/14] Update sugarizer/tasks/install.yml --- roles/sugarizer/tasks/install.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/sugarizer/tasks/install.yml b/roles/sugarizer/tasks/install.yml index e3fe1318c..4bce51ced 100644 --- a/roles/sugarizer/tasks/install.yml +++ b/roles/sugarizer/tasks/install.yml @@ -1,8 +1,8 @@ -- name: MONGODB +- name: MONGODB - run the 'mongodb' role include_role: name: mongodb -- name: NODEJS +- name: NODEJS - run the 'nodejs' role include_role: name: nodejs From 51d662fe959563f93e2bf3c36c4fadbd959c7f32 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Jan 2020 23:29:53 -0500 Subject: [PATCH 09/14] Update roles/pbx/tasks/main.yml --- roles/pbx/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/pbx/tasks/main.yml b/roles/pbx/tasks/main.yml index eb2855ced..7dd0c23a7 100644 --- a/roles/pbx/tasks/main.yml +++ b/roles/pbx/tasks/main.yml @@ -1,4 +1,4 @@ -- name: Run the 'nodejs' role +- name: NODEJS - run the 'nodejs' role include_role: name: nodejs From 2b8f711f1aa9aebe803a489db43fb47e4a4082a9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Jan 2020 23:30:46 -0500 Subject: [PATCH 10/14] Update pathagar/tasks/main.yml --- roles/pathagar/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/pathagar/tasks/main.yml b/roles/pathagar/tasks/main.yml index 4565e262b..2744f8f7a 100644 --- a/roles/pathagar/tasks/main.yml +++ b/roles/pathagar/tasks/main.yml @@ -3,7 +3,7 @@ postgresql_install: True postgresql_enabled: True -- name: Run the 'postgresql' role +- name: POSTGRESQL - run the 'postgresql' role include_role: name: postgresql From ea783c54f96d1e813e8cf541b76971c10fe432a0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Jan 2020 23:31:33 -0500 Subject: [PATCH 11/14] Update nodered/tasks/install.yml --- roles/nodered/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nodered/tasks/install.yml b/roles/nodered/tasks/install.yml index d67d8405f..5bdcb268a 100644 --- a/roles/nodered/tasks/install.yml +++ b/roles/nodered/tasks/install.yml @@ -1,7 +1,7 @@ # 2019-01-16: @jvonau's PR #1403 moved installation of Node.js (8.x for now) & # npm to roles/nodejs/tasks/main.yml -- name: Run the 'nodejs' role +- name: NODEJS - run the 'nodejs' role include_role: name: nodejs # 2020-01-04 no longer triggered by roles/nodered/meta/main.yml From 447a08e80b79eb69eff9e369aa73b24c964d5623 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Jan 2020 23:36:15 -0500 Subject: [PATCH 12/14] Update mysql/tasks/main.yml --- roles/mysql/tasks/main.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/roles/mysql/tasks/main.yml b/roles/mysql/tasks/main.yml index f366745fd..f54b6b38b 100644 --- a/roles/mysql/tasks/main.yml +++ b/roles/mysql/tasks/main.yml @@ -14,7 +14,6 @@ - php{{ php_version }}-xmlrpc state: present when: is_debuntu | bool - #tags: download - name: Install php{{ php_version }}-xml (ubuntu or debian 9+) package: @@ -44,15 +43,12 @@ - php-xmlrpc state: present when: not is_debuntu - #tags: download - include_tasks: centos.yml when: ansible_distribution == "CentOS" - #tags: download - include_tasks: fedora.yml when: ansible_distribution == "Fedora" - #tags: download # 2019-07-03 @jvonau @holta: the next 50 lines (6 stanzas) double MariaDB's @@ -68,7 +64,7 @@ - name: Copy pkg's /lib/systemd/system/mariadb.service to /etc/systemd/system/ to be customized (CREATES TIMESTAMPED BACKUPS OF /etc/systemd/system/mariadb.service e.g. IF OPERATOR CUSTOMIZED IT, EVEN DESPITE WARNING BELOW!) copy: force: yes - backup: no + backup: yes src: /lib/systemd/system/mariadb.service dest: /etc/systemd/system/ when: mariadb_unit_file.stat.exists @@ -178,6 +174,7 @@ state: stopped when: not mysql_enabled + - name: Add 'mysql' variable values to {{ iiab_ini_file }} ini_file: path: "{{ iiab_ini_file }}" From 8fbd09dcaa4ac53fffa6b08d2741c98e06497d43 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Jan 2020 23:37:11 -0500 Subject: [PATCH 13/14] Update moodle/tasks/install.yml --- roles/moodle/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/moodle/tasks/install.yml b/roles/moodle/tasks/install.yml index 0f02d0ac5..527dcb6ca 100644 --- a/roles/moodle/tasks/install.yml +++ b/roles/moodle/tasks/install.yml @@ -3,7 +3,7 @@ postgresql_install: True postgresql_enabled: True -- name: Run the 'postgresql' role +- name: POSTGRESQL - run the 'postgresql' role include_role: name: postgresql From 1631d4678c14f29e96b7f73715e0a5e37572bfd9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Jan 2020 23:39:16 -0500 Subject: [PATCH 14/14] Update moodle/tasks/enable.yml --- roles/moodle/tasks/enable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/moodle/tasks/enable.yml b/roles/moodle/tasks/enable.yml index cff768160..c0afc6ca0 100644 --- a/roles/moodle/tasks/enable.yml +++ b/roles/moodle/tasks/enable.yml @@ -6,7 +6,7 @@ when: moodle_enabled # if the only service using the backend db disable if not running -- name: Disable 'postgresql-iiab' systemd service, if not moodle_enabled +- name: Disable 'postgresql-iiab' systemd service, if not moodle_enabled and not (pathagar_enabled is defined and pathagar_enabled) systemd: name: postgresql-iiab state: stopped