diff options
| -rw-r--r-- | manifests/init.pp | 4 | ||||
| -rw-r--r-- | templates/setmysqlpass.sh.erb | 2 |
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 |