From 3c361728dd5e88c7692c51903605f8539e00928b Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 12 Jan 2020 00:17:54 -0500 Subject: [PATCH 1/3] Cleaner wordpress/tasks/setup.yml --- roles/wordpress/tasks/setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/wordpress/tasks/setup.yml b/roles/wordpress/tasks/setup.yml index 1f0c8a5a9..255d7bc74 100644 --- a/roles/wordpress/tasks/setup.yml +++ b/roles/wordpress/tasks/setup.yml @@ -8,7 +8,7 @@ name: "{{ wp_db_name }}" state: present -- name: Create MySQL wordpress database user +- name: Create MySQL wordpress database user {{ wp_db_user }} with password mysql_user: name: "{{ wp_db_user }}" password: "{{ wp_db_user_password }}" From 2d57c05d33caaa25a8d2a2ed308d610e14f7dd35 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 12 Jan 2020 00:47:46 -0500 Subject: [PATCH 2/3] wordpress/tasks/main.yml conditions need clarity --- roles/wordpress/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/wordpress/tasks/main.yml b/roles/wordpress/tasks/main.yml index 0e1555e01..54dc356cc 100644 --- a/roles/wordpress/tasks/main.yml +++ b/roles/wordpress/tasks/main.yml @@ -1,8 +1,8 @@ # SEE "emergency" REINSTALL INSTRUCTIONS IN roles/wordpress/tasks/install.yml -- name: Provision MySql DB for WordPress +- name: Provision MySQL DB for WordPress include_tasks: setup.yml - when: wordpress_install | bool and not installing | bool + when: wordpress_install and not installing - name: Install WordPress if wordpress_installed is absent include_tasks: install.yml From ce646a734af170a6bf8ce2447a9f3cc0946e7b5b Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 12 Jan 2020 01:10:24 -0500 Subject: [PATCH 3/3] wordpress/tasks/setup.yml readability --- roles/wordpress/tasks/setup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/wordpress/tasks/setup.yml b/roles/wordpress/tasks/setup.yml index 255d7bc74..e9dd88e00 100644 --- a/roles/wordpress/tasks/setup.yml +++ b/roles/wordpress/tasks/setup.yml @@ -3,12 +3,12 @@ state: started name: "{{ mysql_service }}" -- name: 'Create MySQL wordpress database: {{ wp_db_name }}' +- name: 'Create MySQL database for WordPress: {{ wp_db_name }}' mysql_db: name: "{{ wp_db_name }}" state: present -- name: Create MySQL wordpress database user {{ wp_db_user }} with password +- name: Create MySQL username ({{ wp_db_user }}) with password, for WordPress database mysql_user: name: "{{ wp_db_user }}" password: "{{ wp_db_user_password }}"