summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-01-19 15:01:55 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-01-19 15:01:55 -0200
commit7b42b8e003436bf3a1367ec0954ca505189bfa06 (patch)
tree27f09777a99d0921f37e4e86af1af979b66361b0
parent92c0a93c84e7b6687b5a0c61b03f6b0574d57bc4 (diff)
downloadpuppet-mysql-7b42b8e003436bf3a1367ec0954ca505189bfa06.tar.gz
puppet-mysql-7b42b8e003436bf3a1367ec0954ca505189bfa06.tar.bz2
Adding 'flush privileges'
-rw-r--r--manifests/init.pp4
-rw-r--r--templates/setmysqlpass.sh.erb2
2 files changed, 3 insertions, 3 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index ee7e91a..8944595 100644
--- 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 9cb3d39..fbca07e 100644
--- 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