diff --git a/roles/elgg/tasks/setup.yml b/roles/elgg/tasks/setup.yml index d38811fca..f28086fd5 100644 --- a/roles/elgg/tasks/setup.yml +++ b/roles/elgg/tasks/setup.yml @@ -10,8 +10,8 @@ password: "{{ dbpassword }}" priv: "{{ dbname }}.*:ALL" with_items: - - 127.0.0.1 - - ::1 +# - 127.0.0.1 +# - ::1 - localhost - name: Create /tmp/elggdb.sql from template, to load database diff --git a/roles/mysql/defaults/main.yml b/roles/mysql/defaults/main.yml deleted file mode 100644 index 593d62931..000000000 --- a/roles/mysql/defaults/main.yml +++ /dev/null @@ -1,9 +0,0 @@ -# MySQL MANDATORY - THESE 2 VARS HAVE NO EFFECT - SEE roles/0-init/tasks/main.yml & roles/mysql/tasks/main.yml -# mysql_install: True -# mysql_enabled: True - -## mysql_root_password: $6$iiab51$3ICIW0CLWxxMW2a3yrHZ38ukZItD5tcadL4rWcE9D.qIGStxhh8rRsaSxoj3b.MYxI/VRDNjpzSYK/V6zkWFI0 -# mysql_root_password: fixmysql - -# All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml -# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! diff --git a/roles/mysql/tasks/install.yml b/roles/mysql/tasks/install.yml index 23baf1f4a..3ab4f370e 100644 --- a/roles/mysql/tasks/install.yml +++ b/roles/mysql/tasks/install.yml @@ -113,42 +113,31 @@ owner: root mode: '0600' -# 'localhost' needs to be the last item for idempotency, see -# http://ansible.cc/docs/modules.html#mysql-user -# unfortunately it still doesn't work -- name: Update MySQL root password for localhost root accounts - mysql_user: - name: root - host: localhost - password: "{{ mysql_root_password }}" - priv: "*.*:ALL,GRANT" +#- name: Remove the MySQL 'test' database +# mysql_db: +# db: test +# state: absent -- name: Update MySQL root password for all remaining root accounts (127.0.0.1, ::1) - mysql_user: - name: root - host: "{{ item }}" - password: "{{ mysql_root_password }}" - priv: "*.*:ALL,GRANT" - with_items: - #- "{{ iiab_hostname }}.{{ iiab_domain }}" - - 127.0.0.1 - - ::1 +#- name: Delete anonymous MySQL server user for {{ ansible_hostname }} +# mysql_user: +# user: "" +# host: "{{ ansible_hostname }}" +# state: absent -- name: Delete anonymous MySQL server user for {{ ansible_hostname }} - mysql_user: - user: "" - host: "{{ ansible_hostname }}" - state: absent +#- name: Delete anonymous MySQL server user for localhost +# mysql_user: +# user: "" +# state: absent -- name: Delete anonymous MySQL server user for localhost - mysql_user: - user: "" - state: absent - -- name: Remove the MySQL 'test' database - mysql_db: - db: test - state: absent +#- name: Create MySQL root password for root accounts on (127.0.0.1, ::1) +# mysql_user: +# name: root +# host: "{{ item }}" +# password: "{{ mysql_root_password }}" +# priv: "*.*:ALL,GRANT" +# with_items: +# - 127.0.0.1 +# - ::1 # RECORD MySQL AS INSTALLED diff --git a/roles/mysql/templates/my.cnf.j2 b/roles/mysql/templates/my.cnf.j2 index cb1e80ef4..b77876bec 100644 --- a/roles/mysql/templates/my.cnf.j2 +++ b/roles/mysql/templates/my.cnf.j2 @@ -1,4 +1,4 @@ [client] -user=root -password={{ mysql_root_password }} -socket=/run/mysqld/mysqld.sock +user = root +password = +socket = /run/mysqld/mysqld.sock diff --git a/roles/nextcloud/tasks/setup.yml b/roles/nextcloud/tasks/setup.yml index b7dd2408e..73b52e0cc 100644 --- a/roles/nextcloud/tasks/setup.yml +++ b/roles/nextcloud/tasks/setup.yml @@ -9,8 +9,8 @@ password: "{{ nextcloud_dbpassword }}" priv: "{{ nextcloud_dbname }}.*:ALL,GRANT" with_items: - - 127.0.0.1 - - ::1 +# - 127.0.0.1 +# - ::1 - localhost diff --git a/roles/pbx/tasks/freepbx.yml b/roles/pbx/tasks/freepbx.yml index e4838ea87..4ba0c6b9e 100644 --- a/roles/pbx/tasks/freepbx.yml +++ b/roles/pbx/tasks/freepbx.yml @@ -49,9 +49,9 @@ name: "{{ asterisk_db_user }}" password: "{{ asterisk_db_password }}" priv: "{{ asterisk_db_dbname }}.*:ALL/{{ asterisk_db_cdrdbname }}.*:ALL" - login_host: "{{ asterisk_db_host }}" - login_user: "root" - login_password: "{{ mysql_root_password }}" +# login_host: "{{ asterisk_db_host }}" +# login_user: "root" +# login_password: "{{ mysql_root_password }}" host: "{{ (asterisk_db_host == 'localhost') | ternary('localhost', ansible_default_ipv4.address) }}" state: present @@ -60,9 +60,9 @@ name: "{{ asterisk_db_dbname }}" encoding: utf8 collation: utf8_general_ci - login_host: "{{ asterisk_db_host }}" - login_user: "root" - login_password: "{{ mysql_root_password }}" +# login_host: "{{ asterisk_db_host }}" +# login_user: "root" +# login_password: "{{ mysql_root_password }}" state: present - name: FreePBX - Add cdr mysql db diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 700f5c2f1..d731c05e9 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -243,8 +243,6 @@ admin_console_enabled: True # MySQL MANDATORY - THESE 2 VARS HAVE NO EFFECT - SEE roles/0-init/tasks/main.yml & roles/mysql/tasks/main.yml mysql_install: True mysql_enabled: True -# mysql_root_password: $6$iiab51$3ICIW0CLWxxMW2a3yrHZ38ukZItD5tcadL4rWcE9D.qIGStxhh8rRsaSxoj3b.MYxI/VRDNjpzSYK/V6zkWFI0 -mysql_root_password: fixmysql # 2019-01-13: IIAB's use of NGINX is still evolving -- please review this # evolving doc: https://github.com/iiab/iiab/blob/master/roles/nginx/README.md