diff --git a/collections.yml b/collections.yml index f65d3a552..eeb37899e 100644 --- a/collections.yml +++ b/collections.yml @@ -4,11 +4,12 @@ --- collections: - - name: community.general + - name: community.general # community.general.ini_file - name: community.mysql - name: community.postgresql - - name: ansible.posix # 2020-11-28: For ~3 modules below... + - name: ansible.posix # 2025-02-20: For ~3 modules below... # selinux WAS in /opt/iiab/iiab/roles/1-prep/tasks/main.yml # sysctl in /opt/iiab/iiab/roles/2-common/tasks/main.yml +# munin /opt/iiab/iiab/roles/munin/tasks/install.yml # synchronize in /opt/iiab/iiab-admin-console/roles/js-menu/tasks/main.yml diff --git a/roles/2-common/tasks/main.yml b/roles/2-common/tasks/main.yml index c6fb3f21c..9737fecc4 100644 --- a/roles/2-common/tasks/main.yml +++ b/roles/2-common/tasks/main.yml @@ -9,7 +9,7 @@ - include_tasks: packages.yml - name: "Use 'sysctl' to set 'kernel.core_uses_pid: 1' in /etc/sysctl.conf" - sysctl: # Places these settings in /etc/sysctl.conf, to survive reboot + ansible.posix.sysctl: # Places these settings in /etc/sysctl.conf, to survive reboot name: "{{ item.name }}" value: "{{ item.value }}" with_items: diff --git a/roles/mediawiki/tasks/install.yml b/roles/mediawiki/tasks/install.yml index e89afdcd9..369f676eb 100644 --- a/roles/mediawiki/tasks/install.yml +++ b/roles/mediawiki/tasks/install.yml @@ -67,12 +67,12 @@ state: started - name: Create MySQL database {{ mediawiki_db_name }} - mysql_db: + community.mysql.mysql_db: name: "{{ mediawiki_db_name }}" # iiab_mediawiki #state: present - name: Create MySQL database user {{ mediawiki_db_user }} with password, and permissions to above db - mysql_user: + community.mysql.mysql_user: name: "{{ mediawiki_db_user }}" # iiab_mediawiki_user password: "{{ mediawiki_db_user_password }}" priv: "{{ mediawiki_db_name }}.*:ALL,GRANT" diff --git a/roles/moodle/tasks/install.yml b/roles/moodle/tasks/install.yml index 00cf13066..5ec80d2dc 100644 --- a/roles/moodle/tasks/install.yml +++ b/roles/moodle/tasks/install.yml @@ -134,7 +134,7 @@ state: started - name: Create PostgreSQL db user {{ moodle_db_user }}/{{ moodle_db_pass }} - postgresql_user: + community.postgresql.postgresql_user: name: "{{ moodle_db_user }}" # Admin password: "{{ moodle_db_pass }}" # changeme encrypted: yes # Required by PostgreSQL 10+ e.g. Ubuntu 18.04's PostgreSQL 10.3+, see https://github.com/iiab/iiab/issues/759 @@ -144,7 +144,7 @@ become_user: postgres - name: 'Create database: {{ moodle_db_name }}' - postgresql_db: + community.postgresql.postgresql_db: name: "{{ moodle_db_name }}" encoding: utf8 owner: "{{ moodle_db_user }}" diff --git a/roles/munin/tasks/install.yml b/roles/munin/tasks/install.yml index 89fe254cf..12793b2d1 100644 --- a/roles/munin/tasks/install.yml +++ b/roles/munin/tasks/install.yml @@ -5,7 +5,7 @@ # SEE ALSO roles/network/tasks/install.yml - name: "TEMPORARILY REVERT net.ipv6.conf.all.disable_ipv6 to 0 in /etc/sysctl.conf for #3434" - sysctl: + ansible.posix.sysctl: name: net.ipv6.conf.all.disable_ipv6 value: 0 @@ -28,12 +28,12 @@ # SEE ALSO roles/network/tasks/install.yml - name: RESTORE net.ipv6.conf.all.disable_ipv6 to 1 in /etc/sysctl.conf for #3434 - sysctl: + ansible.posix.sysctl: name: net.ipv6.conf.all.disable_ipv6 value: 1 - name: Establish username/password Admin/changeme in /etc/munin/munin-htpasswd - htpasswd: + community.general.htpasswd: path: /etc/munin/munin-htpasswd name: "{{ munin_username}}" # Admin password: "{{ munin_password }}" # changeme diff --git a/roles/nextcloud/tasks/setup.yml b/roles/nextcloud/tasks/setup.yml index 2278c7118..a65ab3e6e 100644 --- a/roles/nextcloud/tasks/setup.yml +++ b/roles/nextcloud/tasks/setup.yml @@ -1,9 +1,9 @@ - name: 'Create MySQL database with name: {{ nextcloud_dbname }}' - mysql_db: + community.mysql.mysql_db: name: "{{ nextcloud_dbname }}" - name: Add username/password to the MySQL database (associated with trusted IP's like localhost) - mysql_user: + community.mysql.mysql_user: name: "{{ nextcloud_dbuser }}" host: "{{ item }}" password: "{{ nextcloud_dbpassword }}" diff --git a/roles/pbx/tasks/freepbx.yml b/roles/pbx/tasks/freepbx.yml index 1bba7773c..cc6a0cf43 100644 --- a/roles/pbx/tasks/freepbx.yml +++ b/roles/pbx/tasks/freepbx.yml @@ -150,7 +150,7 @@ - name: FreePBX - Add MySQL user ({{ asterisk_db_user }}) - mysql_user: + community.mysql.mysql_user: name: "{{ asterisk_db_user }}" # asterisk password: "{{ asterisk_db_password }}" # asterisk priv: "{{ asterisk_db_dbname }}.*:ALL/{{ asterisk_db_cdrdbname }}.*:ALL" @@ -160,7 +160,7 @@ host: "{{ (asterisk_db_host == 'localhost') | ternary('localhost', ansible_default_ipv4.address) }}" - name: FreePBX - Add MySQL db ({{ asterisk_db_dbname }}) - mysql_db: + community.mysql.mysql_db: name: "{{ asterisk_db_dbname }}" # asterisk encoding: utf8 collation: utf8_general_ci @@ -169,7 +169,7 @@ login_password: "{{ asterisk_db_password }}" - name: FreePBX - Add CDR MySQL db ({{ asterisk_db_cdrdbname }}) - mysql_db: + community.mysql.mysql_db: name: "{{ asterisk_db_cdrdbname }}" # asteriskcdrdb encoding: utf8 collation: utf8_general_ci diff --git a/roles/wordpress/tasks/setup.yml b/roles/wordpress/tasks/setup.yml index 38ddb87f7..8a7601d47 100644 --- a/roles/wordpress/tasks/setup.yml +++ b/roles/wordpress/tasks/setup.yml @@ -4,11 +4,11 @@ name: "{{ mysql_service }}" - name: 'Create MySQL database for WordPress: {{ wp_db_name }}' - mysql_db: + community.mysql.mysql_db: name: "{{ wp_db_name }}" - name: Create MySQL username ({{ wp_db_user }}) with password, for above database - mysql_user: + community.mysql.mysql_user: name: "{{ wp_db_user }}" password: "{{ wp_db_user_password }}" priv: "{{ wp_db_name }}.*:ALL,GRANT"