From fff73af28171ee3f1f12a07fcf48ce8ad6080c5d Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 23 Oct 2020 03:59:00 +0200 Subject: clean up mysql role --- roles/apt-repo/percona/files/repo.gpg | Bin 0 -> 3299 bytes roles/apt-repo/percona/tasks/main.yml | 19 +++++++++++++++++++ roles/elevate/media/tasks/main.yml | 1 - roles/elevate/media/tasks/nextcloud.yml | 4 ++-- roles/mysql/files/percona.gpg | Bin 3299 -> 0 bytes roles/mysql/tasks/main.yml | 23 ++++++++++++++++++----- roles/mysql/tasks/mysql-secure-installation.yml | 22 ---------------------- roles/mysql/tasks/percona.yml | 19 ------------------- 8 files changed, 39 insertions(+), 49 deletions(-) create mode 100644 roles/apt-repo/percona/files/repo.gpg create mode 100644 roles/apt-repo/percona/tasks/main.yml delete mode 100644 roles/mysql/files/percona.gpg delete mode 100644 roles/mysql/tasks/mysql-secure-installation.yml delete mode 100644 roles/mysql/tasks/percona.yml (limited to 'roles') diff --git a/roles/apt-repo/percona/files/repo.gpg b/roles/apt-repo/percona/files/repo.gpg new file mode 100644 index 00000000..56220c91 Binary files /dev/null and b/roles/apt-repo/percona/files/repo.gpg differ diff --git a/roles/apt-repo/percona/tasks/main.yml b/roles/apt-repo/percona/tasks/main.yml new file mode 100644 index 00000000..8357b693 --- /dev/null +++ b/roles/apt-repo/percona/tasks/main.yml @@ -0,0 +1,19 @@ +--- +- name: add repository key + copy: + src: repo.gpg + dest: /etc/apt/trusted.gpg.d/percona.gpg + register: apt_repo_percona_key + +- name: add repository entry + copy: + content: | + deb http://repo.percona.com/apt {{ ansible_distribution_release }} main + dest: /etc/apt/sources.list.d/percona.list + register: apt_repo_percona_sources + +- name: update apt cache + when: apt_repo_percona_key is changed or + apt_repo_percona_sources is changed + apt: + update_cache: yes diff --git a/roles/elevate/media/tasks/main.yml b/roles/elevate/media/tasks/main.yml index 13ffa766..21cdd26f 100644 --- a/roles/elevate/media/tasks/main.yml +++ b/roles/elevate/media/tasks/main.yml @@ -35,4 +35,3 @@ src: dstat.sh.j2 dest: /usr/local/bin/dstat.sh mode: 0755 - diff --git a/roles/elevate/media/tasks/nextcloud.yml b/roles/elevate/media/tasks/nextcloud.yml index 4dcedf31..e9be69d2 100644 --- a/roles/elevate/media/tasks/nextcloud.yml +++ b/roles/elevate/media/tasks/nextcloud.yml @@ -45,7 +45,7 @@ - name: create nextcloud database mysql_db: login_user: root - login_password: "{{ mysql_root_password }}" + login_unix_socket: /var/run/mysqld/mysqld.sock db: "{{ nextcloud_db.db }}" encoding: utf8mb4 collation: utf8mb4_general_ci @@ -54,7 +54,7 @@ - name: create nextcloud database user mysql_user: login_user: root - login_password: "{{ mysql_root_password }}" + login_unix_socket: /var/run/mysqld/mysqld.sock name: "{{ nextcloud_db.user }}" password: "{{ nextcloud_db.password }}" priv: "{{ nextcloud_db.db }}.*:SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX,ALTER,CREATE TEMPORARY TABLES" diff --git a/roles/mysql/files/percona.gpg b/roles/mysql/files/percona.gpg deleted file mode 100644 index 56220c91..00000000 Binary files a/roles/mysql/files/percona.gpg and /dev/null differ diff --git a/roles/mysql/tasks/main.yml b/roles/mysql/tasks/main.yml index 3f142f6b..3bb125d4 100644 --- a/roles/mysql/tasks/main.yml +++ b/roles/mysql/tasks/main.yml @@ -1,15 +1,28 @@ --- - name: prepare package provider when: mysql_pkg_provider != 'distro' - include_tasks: "{{ mysql_pkg_provider }}.yml" + include_role: + name: "apt-repo/{{ mysql_pkg_provider }}" - name: install mysql packages apt: name: - - "{{ mysql_pkg_name }}" - - "{{ python_basename }}-pymysql" + - "{{ mysql_pkg_name }}" + - "{{ python_basename }}-pymysql" state: present force: yes -- name: remove insecure defaults - import_tasks: mysql-secure-installation.yml +- name: delete anonymous MySQL server user + mysql_user: + login_user: root + login_unix_socket: /var/run/mysqld/mysqld.sock + user: "" + state: absent + no_log: true + +- name: remove the MySQL test database + mysql_db: + login_user: root + login_unix_socket: /var/run/mysqld/mysqld.sock + db: test + state: absent diff --git a/roles/mysql/tasks/mysql-secure-installation.yml b/roles/mysql/tasks/mysql-secure-installation.yml deleted file mode 100644 index 28674cfd..00000000 --- a/roles/mysql/tasks/mysql-secure-installation.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- name: set mysql root password - mysql_user: - login_user: root - login_password: "{{ mysql_root_password }}" - user: root - password: "{{ mysql_root_password }}" - host: localhost - -- name: delete anonymous MySQL server user - mysql_user: - login_user: root - login_password: "{{ mysql_root_password }}" - user: "" - state: absent - -- name: remove the MySQL test database - mysql_db: - login_user: root - login_password: "{{ mysql_root_password }}" - db: test - state: absent diff --git a/roles/mysql/tasks/percona.yml b/roles/mysql/tasks/percona.yml deleted file mode 100644 index 72b4b9d9..00000000 --- a/roles/mysql/tasks/percona.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -- name: add repository key - copy: - src: percona.gpg - dest: /etc/apt/trusted.gpg.d/mysql.gpg - register: apt_repo_percona_key - -- name: add repository entry - copy: - content: | - deb http://repo.percona.com/apt {{ ansible_distribution_release }} main - dest: /etc/apt/sources.list.d/mysql.list - register: apt_repo_percona_sources - -- name: update apt cache - when: apt_repo_percona_key is changed or - apt_repo_percona_sources is changed - apt: - update_cache: yes -- cgit v1.2.3