From 839c0f3eb1dcfb7975cdb8988cac3e8c6f24461b Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Mon, 2 Nov 2015 09:56:50 +0200
Subject: [PATCH] - Don't set default random password, should be set as part of
group/ host var. - Don't create database and account, left to the application
role.
---
.gitignore | 1 -
defaults/main.yml | 2 +-
tasks/main.yml | 21 +--------------------
3 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/.gitignore b/.gitignore
index 62efb56..eb9b1f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,3 @@
*~
*.swp
*.swo
-files/mysql_root_password
diff --git a/defaults/main.yml b/defaults/main.yml
index 17ea050..62a8485 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,4 +1,4 @@
---
# defaults file for ansible-mysql
-mysql_root_password: '{{ lookup("password", "mysql_root_password") }}'
+mysql_root_password:
diff --git a/tasks/main.yml b/tasks/main.yml
index f8cb0c4..1bead0e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,6 +2,7 @@
# tasks file for ansible-mysql
- name: Preseed
+ when: mysql_root_password is defined
debconf:
name: mysql-server-5.5
question: '{{ item }}'
@@ -23,26 +24,6 @@
- python-mysqldb
- cron
-- name: Create database
- when: mysql_database is defined
- mysql_db:
- login_user: root
- login_password: '{{ mysql_root_password }}'
- collation: utf8_general_ci
- encoding: utf8
- name: '{{ mysql_database }}'
- state: present
-
-- name: Create account
- when: mysql_user is defined and mysql_database is defined
- mysql_user:
- login_user: root
- login_password: '{{ mysql_root_password }}'
- name: '{{ mysql_user }}'
- password: '{{ mysql_password|default(omit) }}'
- priv: '{{ mysql_database }}.*:SELECT,INSERT,UPDATE,DELETE,CREATE,INDEX'
- state: present
-
- name: Add daily backup job
copy:
src: backup.sh
--
GitLab