diff --git a/.gitignore b/.gitignore index 62efb565634bc4937a17b0237cd657487025d78f..eb9b1f62f4139a3d76acdc34227f910ab5bad6c4 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 17ea05053bca2082e9fe8987fb3350de78ad459d..62a8485e4e404be417f18143eb8e89f24045e5b4 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 f8cb0c4849836d77e7ba7c04132b82df0da6e813..1bead0ec36d2d7f945b456b03efac73fb0844157 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