summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2013-01-02 18:48:49 +0100
committermh <mh@immerda.ch>2013-01-02 18:48:49 +0100
commitc1c3b112459f995afdaae9cc9aa415ea68788596 (patch)
treef70bea4dc3bb258e5c84d1942dca43515be2fdee /templates
parent2e57128b061d65e3c54297b4cd7d3759625a3dce (diff)
make trocla an optional dependency
Diffstat (limited to 'templates')
-rw-r--r--templates/root/my.cnf.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/root/my.cnf.erb b/templates/root/my.cnf.erb
index 26ced1e..86782aa 100644
--- a/templates/root/my.cnf.erb
+++ b/templates/root/my.cnf.erb
@@ -1,4 +1,4 @@
[client]
user=root
host=localhost
-password=<%= Puppet::Parser::Functions.function('trocla');'' %><%= scope.function_trocla("mysql_root_#{scope.lookupvar('::fqdn')}",'plain', 'length' => 32) %>
+password=<%= scope.lookupvar('mysql::server::root_password') %>