aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-22 18:25:11 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-22 18:25:11 -0300
commitbfce265ba43643d8b3b3f486152663431c9a83da (patch)
tree5f6636641cc421b699aa65f61abddeb6a5ec180f
parent8ac9d4cc9910af53d3e7c9e9536ed7a77d4d7122 (diff)
downloadpuppet-backupninja-bfce265ba43643d8b3b3f486152663431c9a83da.tar.gz
puppet-backupninja-bfce265ba43643d8b3b3f486152663431c9a83da.tar.bz2
Fix deprecation warnings at mysql template
-rw-r--r--templates/mysql.conf.erb13
1 files changed, 8 insertions, 5 deletions
diff --git a/templates/mysql.conf.erb b/templates/mysql.conf.erb
index ad47f15..f14fadd 100644
--- a/templates/mysql.conf.erb
+++ b/templates/mysql.conf.erb
@@ -3,11 +3,14 @@
# the next time Puppet runs. Please make configuration changes to this
# service in Puppet.
-<% %w{user dbusername dbpassword dbhost databases backupdir vsname sqldumpoptions}.each do |v|
- if send(v)
- -%><%= v + ' = ' + send(v) + "\n" %><%
- end
-end -%>
+<%= 'user = '+ @user if @user %>
+<%= 'dbusername = '+ @dbusername if @dbusername %>
+<%= 'dbpassword = '+ @dbpassword if @dbpassword %>
+<%= 'dbhost = '+ @dbhost if @dbhost %>
+<%= 'databases = '+ @databases if @databases %>
+<%= 'backupdir = '+ @backupdir if @backupdir %>
+<%= 'vsname = '+ @vsname if @vsname %>
+<%= 'sqldumpoptions = '+ @sqldumpoptions if @sqldumpoptions %>
hotcopy = <%= @hotcopy ? 'yes' : 'no' %>
sqldump = <%= @sqldump ? 'yes' : 'no' %>