Adding 'flush privileges'

diff --git a/manifests/init.pp b/manifests/init.pp
index ee7e91a050a537d5185d38266553ecbbf87f3c21..8944595cd8385b6a2555111a4d1e40d3ecba76ce 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -27,7 +27,7 @@ class mysql::server inherits mysql {
 
   file { '/usr/local/sbin/setmysqlpass.sh':
     content => template('mysql/setmysqlpass.sh.erb'),
-    require => Package[mysql-server],
+    require => Service['mysql'],
     owner   => root,
     group   => root,
     mode    => 0500,
@@ -49,7 +49,7 @@ class mysql::server inherits mysql {
     $mysql_passwd = $passwd
     file { "$home/.my.cnf":
       content => template('mysql/my.cnf.erb'),
-      require => [ Package[mysql-server] ],
+      require => Service['mysql'],
       owner   => root,
       group   => root,
       mode    => 0400,

diff --git a/templates/setmysqlpass.sh.erb b/templates/setmysqlpass.sh.erb
index 9cb3d399cf0ef408fd373e703e19a859f3b8d407..fbca07e28121e47a1eed317a1436410b99c371d1 100644 (file)
--- a/templates/setmysqlpass.sh.erb
+++ b/templates/setmysqlpass.sh.erb
@@ -8,5 +8,5 @@ PASSWORD="<%= mysql_rootpw %>"
 DEFAULTS="/etc/mysql/debian.cnf"
 
 # Run
-echo "USE mysql; UPDATE user SET Password=PASSWORD('$PASSWORD') WHERE User='root' AND Host='localhost';" | \
+echo "USE mysql; UPDATE user SET Password=PASSWORD('$PASSWORD') WHERE User='root' AND Host='localhost'; flush privileges;" | \
   /usr/bin/mysql --defaults-file=$DEFAULTS