summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-25 16:05:43 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-25 16:05:43 -0200
commit8f23dc4b9e0cd86385d5c864dbac0e1ef550c700 (patch)
tree387fffa767bd71fffeaae65995279deca0fb170e /templates
parent9ad7371b4639d69001ea08e8beceee42dbfdaea7 (diff)
downloadpuppet-mysql-8f23dc4b9e0cd86385d5c864dbac0e1ef550c700.tar.gz
puppet-mysql-8f23dc4b9e0cd86385d5c864dbac0e1ef550c700.tar.bz2
Switching to parametrized class and hiera
Diffstat (limited to 'templates')
-rw-r--r--templates/my.cnf.erb2
-rw-r--r--templates/setmysqlpass.sh.erb2
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/my.cnf.erb b/templates/my.cnf.erb
index c56c89f..06e7e43 100644
--- a/templates/my.cnf.erb
+++ b/templates/my.cnf.erb
@@ -1,4 +1,4 @@
[client]
user=root
host=localhost
-password=<%= mysql_passwd %>
+password=<%= @passwd %>
diff --git a/templates/setmysqlpass.sh.erb b/templates/setmysqlpass.sh.erb
index b3b14b3..372b513 100644
--- a/templates/setmysqlpass.sh.erb
+++ b/templates/setmysqlpass.sh.erb
@@ -4,7 +4,7 @@
#
# Config
-PASSWORD="<%= mysql_rootpw %>"
+PASSWORD="<%= @rootpw %>"
DEFAULTS="/etc/mysql/debian.cnf"
# Run