# HG changeset patch # User IBBoard # Date 1425871818 0 # Node ID 25405d1350ef5196534d1427c48f8c339a28cac6 # Parent 58d1818c2ded3dccaf3c8f0aa39e3037ee6e23ec Remove unnecessary log directory creation and try to fix SQL statement diff -r 58d1818c2ded -r 25405d1350ef modules/website/manifests/mysql.pp --- a/modules/website/manifests/mysql.pp Mon Mar 09 01:34:59 2015 +0000 +++ b/modules/website/manifests/mysql.pp Mon Mar 09 03:30:18 2015 +0000 @@ -27,17 +27,11 @@ } }, } - file { '/var/log/mysql': - ensure => directory, - owner => 'mysql', - group => 'mysql', - require => Class['mysql::server'], - } $username = strip($mysqluser) $password = strip($mysqlpassword) $configured_marker = '/etc/mysql/.is-configured' exec { 'Rename root MySQL user for security': - command => "mysql -uroot -e 'UPDATE mysql.user SET User = \"$username\", Password = PASSWORD(\"$password\") WHERE User = \"root\"; DELETE FROM mysql.user WHERE User = ''; FLUSH PRIVILEGES;' && touch $configured_marker", + command => "mysql -u root -e 'UPDATE mysql.user SET User = \"$username\", Password = PASSWORD(\"$password\") WHERE User = \"root\"; DELETE FROM mysql.user WHERE User = \'\'; FLUSH PRIVILEGES;' && touch $configured_marker", provider => shell, creates => $configured_marker, require => Class['mysql::server'],