From b2434f9290501a40557d03e817c1bd58d9005059 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Fri, 21 Feb 2025 11:28:59 -0600 Subject: [PATCH] move on-demand to main.yml from install.yml Could of used main.yml when the below were added https://github.com/iiab/iiab/pull/3665 https://github.com/iiab/iiab/pull/3668 --- roles/matomo/tasks/install.yml | 15 --------------- roles/matomo/tasks/main.yml | 14 ++++++++++++++ roles/mediawiki/tasks/install.yml | 15 --------------- roles/mediawiki/tasks/main.yml | 15 +++++++++++++++ roles/moodle/tasks/install.yml | 10 ---------- roles/moodle/tasks/main.yml | 14 ++++++++++++++ roles/nextcloud/tasks/install.yml | 15 --------------- roles/nextcloud/tasks/main.yml | 14 ++++++++++++++ roles/pbx/tasks/install.yml | 15 --------------- roles/pbx/tasks/main.yml | 14 ++++++++++++++ roles/wordpress/tasks/install.yml | 15 --------------- roles/wordpress/tasks/main.yml | 14 ++++++++++++++ 12 files changed, 85 insertions(+), 85 deletions(-) diff --git a/roles/matomo/tasks/install.yml b/roles/matomo/tasks/install.yml index 7de697f49..8aefcf405 100644 --- a/roles/matomo/tasks/install.yml +++ b/roles/matomo/tasks/install.yml @@ -12,21 +12,6 @@ # fatal: [127.0.0.1]: FAILED! => {"cache_control": "private, no-cache, no-store", "changed": false, "connection": "close", "content_type": "text/html; charset=utf-8", "date": "Wed, 15 Jun 2022 05:07:41 GMT", "elapsed": 0, "expires": "Thu, 19 Nov 1981 08:52:00 GMT", "msg": "Status code was 500 and not [200]: HTTP Error 500: Internal Server Error", "pragma": "no-cache", "redirected": false, "server": "nginx/1.18.0 (Ubuntu)", "set_cookie": "MATOMO_SESSID=psak3aem27vrdrt8t2f016600f; path=/; HttpOnly; SameSite=Lax", "status": 500, "transfer_encoding": "chunked", "url": "http://box.lan/matomo/index.php?action=welcome", "x_matomo_request_id": "fbfd2"} -- name: "Set 'mysql_install: True' and 'mysql_enabled: True'" - set_fact: - mysql_install: True - mysql_enabled: True - -- name: MYSQL - run 'mysql' role (attempt to install & enable MySQL / MariaDB) - include_role: - name: mysql - -- name: FAIL (STOP THE INSTALL) IF 'mysql_installed is undefined' - fail: - msg: "Matomo install cannot proceed, as MySQL / MariaDB is not installed." - when: mysql_installed is undefined - - - name: Record (initial) disk space used shell: df -B1 --output=used / | tail -1 register: df1 diff --git a/roles/matomo/tasks/main.yml b/roles/matomo/tasks/main.yml index b99de06e7..ba5001a07 100644 --- a/roles/matomo/tasks/main.yml +++ b/roles/matomo/tasks/main.yml @@ -18,6 +18,20 @@ fail_msg: "PLEASE GIVE VARIABLE 'matomo_enabled' A PROPER (UNQUOTED) ANSIBLE BOOLEAN VALUE e.g. IN: /etc/iiab/local_vars.yml" quiet: yes +- name: "Set 'mysql_install: True' and 'mysql_enabled: True'" + set_fact: + mysql_install: True + mysql_enabled: True + +- name: MYSQL - run 'mysql' role (attempt to install & enable MySQL / MariaDB) + include_role: + name: mysql + +- name: FAIL (STOP THE INSTALL) IF 'mysql_installed is undefined' + fail: + msg: "Matomo install cannot proceed, as MySQL / MariaDB is not installed." + when: mysql_installed is undefined + - block: diff --git a/roles/mediawiki/tasks/install.yml b/roles/mediawiki/tasks/install.yml index 369f676eb..0ffc63cfe 100644 --- a/roles/mediawiki/tasks/install.yml +++ b/roles/mediawiki/tasks/install.yml @@ -1,18 +1,3 @@ -- name: "Set 'mysql_install: True' and 'mysql_enabled: True'" - set_fact: - mysql_install: True - mysql_enabled: True - -- name: MYSQL - run 'mysql' role (attempt to install & enable MySQL / MariaDB) - include_role: - name: mysql - -- name: FAIL (STOP THE INSTALL) IF 'mysql_installed is undefined' - fail: - msg: "MediaWiki install cannot proceed, as MySQL / MariaDB is not installed." - when: mysql_installed is undefined - - - name: Record (initial) disk space used shell: df -B1 --output=used / | tail -1 register: df1 diff --git a/roles/mediawiki/tasks/main.yml b/roles/mediawiki/tasks/main.yml index 1a0318e06..29d0b1092 100644 --- a/roles/mediawiki/tasks/main.yml +++ b/roles/mediawiki/tasks/main.yml @@ -18,6 +18,21 @@ fail_msg: "PLEASE GIVE VARIABLE 'mediawiki_enabled' A PROPER (UNQUOTED) ANSIBLE BOOLEAN VALUE e.g. IN: /etc/iiab/local_vars.yml" quiet: yes +- name: "Set 'mysql_install: True' and 'mysql_enabled: True'" + set_fact: + mysql_install: True + mysql_enabled: True + +- name: MYSQL - run 'mysql' role (attempt to install & enable MySQL / MariaDB) + include_role: + name: mysql + +- name: FAIL (STOP THE INSTALL) IF 'mysql_installed is undefined' + fail: + msg: "MediaWiki install cannot proceed, as MySQL / MariaDB is not installed." + when: mysql_installed is undefined + + - block: diff --git a/roles/moodle/tasks/install.yml b/roles/moodle/tasks/install.yml index 5ec80d2dc..e5681187c 100644 --- a/roles/moodle/tasks/install.yml +++ b/roles/moodle/tasks/install.yml @@ -21,16 +21,6 @@ # sudo -u www-data /usr/bin/php admin/cli/maintenance.php --disable -- name: "Set 'postgresql_install: True' and 'postgresql_enabled: True'" - set_fact: - postgresql_install: True - postgresql_enabled: True - -- name: POSTGRESQL - run 'postgresql' role (attempt to install & enable PostgreSQL) - include_role: - name: postgresql - - - name: Record (initial) disk space used shell: df -B1 --output=used / | tail -1 register: df1 diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml index aeb40556f..46af6ced4 100644 --- a/roles/moodle/tasks/main.yml +++ b/roles/moodle/tasks/main.yml @@ -18,6 +18,20 @@ fail_msg: "PLEASE GIVE VARIABLE 'moodle_enabled' A PROPER (UNQUOTED) ANSIBLE BOOLEAN VALUE e.g. IN: /etc/iiab/local_vars.yml" quiet: yes +- name: "Set 'postgresql_install: True' and 'postgresql_enabled: True'" + set_fact: + postgresql_install: True + postgresql_enabled: True + +- name: POSTGRESQL - run 'postgresql' role (attempt to install & enable PostgreSQL) + include_role: + name: postgresql + +- name: FAIL (STOP THE INSTALL) IF 'postgresql_installed is undefined' + fail: + msg: "Moodle install cannot proceed, as postgresql is not installed." + when: postgresql_installed is undefined + - block: diff --git a/roles/nextcloud/tasks/install.yml b/roles/nextcloud/tasks/install.yml index 2fae98551..6a52d29c1 100644 --- a/roles/nextcloud/tasks/install.yml +++ b/roles/nextcloud/tasks/install.yml @@ -1,18 +1,3 @@ -- name: "Set 'mysql_install: True' and 'mysql_enabled: True'" - set_fact: - mysql_install: True - mysql_enabled: True - -- name: MYSQL - run 'mysql' role (attempt to install & enable MySQL / MariaDB) - include_role: - name: mysql - -- name: FAIL (STOP THE INSTALL) IF 'mysql_installed is undefined' - fail: - msg: "Nextcloud install cannot proceed, as MySQL / MariaDB is not installed." - when: mysql_installed is undefined - - - name: Record (initial) disk space used shell: df -B1 --output=used / | tail -1 register: df1 diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index 1308da347..ad6214b50 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -18,6 +18,20 @@ fail_msg: "PLEASE GIVE VARIABLE 'nextcloud_enabled' A PROPER (UNQUOTED) ANSIBLE BOOLEAN VALUE e.g. IN: /etc/iiab/local_vars.yml" quiet: yes +- name: "Set 'mysql_install: True' and 'mysql_enabled: True'" + set_fact: + mysql_install: True + mysql_enabled: True + +- name: MYSQL - run 'mysql' role (attempt to install & enable MySQL / MariaDB) + include_role: + name: mysql + +- name: FAIL (STOP THE INSTALL) IF 'mysql_installed is undefined' + fail: + msg: "Nextcloud install cannot proceed, as MySQL / MariaDB is not installed." + when: mysql_installed is undefined + - block: diff --git a/roles/pbx/tasks/install.yml b/roles/pbx/tasks/install.yml index 5c49dfa14..ef9dea71d 100644 --- a/roles/pbx/tasks/install.yml +++ b/roles/pbx/tasks/install.yml @@ -22,21 +22,6 @@ # when: nodejs_version != "12.x" -- name: "Set 'mysql_install: True' and 'mysql_enabled: True'" - set_fact: - mysql_install: True - mysql_enabled: True - -- name: MYSQL - run 'mysql' role (attempt to install & enable MySQL / MariaDB) - include_role: - name: mysql - -- name: FAIL (STOP THE INSTALL) IF 'mysql_installed is undefined' - fail: - msg: "PBX install cannot proceed, as MySQL / MariaDB is not installed." - when: mysql_installed is undefined - - - name: Record (initial) disk space used shell: df -B1 --output=used / | tail -1 register: df1 diff --git a/roles/pbx/tasks/main.yml b/roles/pbx/tasks/main.yml index 669f05277..264e7c4ac 100644 --- a/roles/pbx/tasks/main.yml +++ b/roles/pbx/tasks/main.yml @@ -18,6 +18,20 @@ fail_msg: "PLEASE GIVE VARIABLE 'pbx_enabled' A PROPER (UNQUOTED) ANSIBLE BOOLEAN VALUE e.g. IN: /etc/iiab/local_vars.yml" quiet: yes +- name: "Set 'mysql_install: True' and 'mysql_enabled: True'" + set_fact: + mysql_install: True + mysql_enabled: True + +- name: MYSQL - run 'mysql' role (attempt to install & enable MySQL / MariaDB) + include_role: + name: mysql + +- name: FAIL (STOP THE INSTALL) IF 'mysql_installed is undefined' + fail: + msg: "PBX install cannot proceed, as MySQL / MariaDB is not installed." + when: mysql_installed is undefined + - block: diff --git a/roles/wordpress/tasks/install.yml b/roles/wordpress/tasks/install.yml index fb4aca021..38fb08180 100644 --- a/roles/wordpress/tasks/install.yml +++ b/roles/wordpress/tasks/install.yml @@ -12,21 +12,6 @@ # can arise without warning when WordPress is online, since WordPress ~4.8 -- name: "Set 'mysql_install: True' and 'mysql_enabled: True'" - set_fact: - mysql_install: True - mysql_enabled: True - -- name: MYSQL - run 'mysql' role (attempt to install & enable MySQL / MariaDB) - include_role: - name: mysql - -- name: FAIL (STOP THE INSTALL) IF 'mysql_installed is undefined' - fail: - msg: "WordPress install cannot proceed, as MySQL / MariaDB is not installed." - when: mysql_installed is undefined - - - name: Record (initial) disk space used shell: df -B1 --output=used / | tail -1 register: df1 diff --git a/roles/wordpress/tasks/main.yml b/roles/wordpress/tasks/main.yml index 106343a84..6d5085583 100644 --- a/roles/wordpress/tasks/main.yml +++ b/roles/wordpress/tasks/main.yml @@ -20,6 +20,20 @@ fail_msg: "PLEASE GIVE VARIABLE 'wordpress_enabled' A PROPER (UNQUOTED) ANSIBLE BOOLEAN VALUE e.g. IN: /etc/iiab/local_vars.yml" quiet: yes +- name: "Set 'mysql_install: True' and 'mysql_enabled: True'" + set_fact: + mysql_install: True + mysql_enabled: True + +- name: MYSQL - run 'mysql' role (attempt to install & enable MySQL / MariaDB) + include_role: + name: mysql + +- name: FAIL (STOP THE INSTALL) IF 'mysql_installed is undefined' + fail: + msg: "WordPress install cannot proceed, as MySQL / MariaDB is not installed." + when: mysql_installed is undefined + - block: