Skip to content
This repository was archived by the owner on May 25, 2022. It is now read-only.

Commit c859537

Browse files
committed
Fix problem with phpmyadmin manifest @ windows
1 parent f538fb1 commit c859537

File tree

1 file changed

+2
-7
lines changed
  • puppet/modules/phpmyadmin/manifests

1 file changed

+2
-7
lines changed

Diff for: puppet/modules/phpmyadmin/manifests/init.pp

+2-7
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,8 @@
5757
# On some machines the phpmyadmin user might be already installed.
5858
# We have to drop and re-add this user because of new privileges and password.
5959
exec{ 'creating-phpmyadmin-controluser':
60-
command => "echo \"CREATE USER 'phpmyadmin'@'localhost'\
61-
IDENTIFIED BY '${::pma_controluser_password}';\
62-
GRANT ALL ON *.* TO 'phpmyadmin'@'localhost';FLUSH PRIVILEGES;\"\
63-
| mysql -u root -p'${::pma_mysql_root_password}'",
60+
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}'",
6461
path => ['/usr/local/bin', '/usr/bin', '/bin'],
65-
unless => "mysql -u root -p'${::pma_mysql_root_password}'\
66-
-e 'select * from mysql.user WHERE User=\"phpmyadmin\"' \
67-
| grep 'phpmyadmin'"
62+
unless => "mysql -u root -p'${::pma_mysql_root_password}' -e 'select * from mysql.user WHERE User=\"phpmyadmin\"' | grep 'phpmyadmin'"
6863
}
6964
}

0 commit comments

Comments
 (0)