From 04de9cd7a755c16136707a36bf43043d8cd12bb6 Mon Sep 17 00:00:00 2001
From: shreyas <shreyas@erpnext.com>
Date: Mon, 14 Mar 2016 11:38:59 +0530
Subject: [PATCH] [Travis] Bypass the prompt while purging mysql

---
 .travis.yml                                                   | 4 +---
 .../roles/mariadb/tasks/mysql_secure_installation.yml         | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2565d7e9..cb0b9504 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,7 @@ python:
   - "2.7"
 
 install:
-  - sudo apt-get remove --purge --force-yes mysql-common mysql-server mysql-client
-  - sudo apt-get autoremove
-  - sudo apt-get autoclean
+  - sudo apt-get purge -y mysql-common mysql-server mysql-client
   - sudo python $TRAVIS_BUILD_DIR/installer/install.py --user travis --skip-bench-setup
   # - sudo bash $TRAVIS_BUILD_DIR/install_scripts/setup_frappe.sh --skip-install-bench --mysql-root-password travis
   - mkdir -p ~/bench-repo
diff --git a/installer/playbooks/roles/mariadb/tasks/mysql_secure_installation.yml b/installer/playbooks/roles/mariadb/tasks/mysql_secure_installation.yml
index b92dc143..6d1d9996 100644
--- a/installer/playbooks/roles/mariadb/tasks/mysql_secure_installation.yml
+++ b/installer/playbooks/roles/mariadb/tasks/mysql_secure_installation.yml
@@ -10,7 +10,9 @@
     - localhost
 
 - name: Add .my.cnf
-  template: src=my.cnf.j2 dest=/root/.my.cnf owner=root group=root mode=0600
+  command: '/usr/bin/whoami'
+  register: current_user
+  template: src=my.cnf.j2 dest=/home/{{ current_user }}/.my.cnf owner=root group=root mode=0600
 
 - name: Set root Password
   mysql_user: name=root host={{ item }} password={{ mysql_root_password }} state=present