Merge pull request #8 from janvandijk/Fix-problem-with-myphpadmin-under-windows

Fix problem with phpmyadmin manifest @ windows

Author: stevenrombauts

puppet/modules/phpmyadmin/manifests/init.pp

@@ -57,13 +57,8 @@
   # On some machines the phpmyadmin user might be already installed.
   # We have to drop and re-add this user because of new privileges and password.
   exec{ 'creating-phpmyadmin-controluser':
-    command => "echo \"CREATE USER 'phpmyadmin'@'localhost'\
-      IDENTIFIED BY '${::pma_controluser_password}';\
-      GRANT ALL ON *.* TO 'phpmyadmin'@'localhost';FLUSH PRIVILEGES;\"\
-      | mysql -u root -p'${::pma_mysql_root_password}'",
+    command => "echo \"CREATE USER 'phpmyadmin'@'localhost' IDENTIFIED BY '${::pma_controluser_password}'; GRANT ALL ON *.* TO 'phpmyadmin'@'localhost';FLUSH PRIVILEGES;\" | mysql -u root -p'${::pma_mysql_root_password}'",
     path    => ['/usr/local/bin', '/usr/bin', '/bin'],
-    unless  => "mysql -u root -p'${::pma_mysql_root_password}'\
-      -e 'select * from mysql.user WHERE User=\"phpmyadmin\"' \
-      | grep 'phpmyadmin'"
+    unless  => "mysql -u root -p'${::pma_mysql_root_password}' -e 'select * from mysql.user WHERE User=\"phpmyadmin\"' | grep 'phpmyadmin'"
   }
 }