From 625ffd23ee88b26287fadd0db33d1ceababbac21 Mon Sep 17 00:00:00 2001 From: Jamie McClelland Date: Sat, 19 Mar 2011 23:55:22 -0400 Subject: We might get either a var or an array - we should be able to take either. --- templates/mysql.conf.erb | 8 +++++--- templates/pgsql.conf.erb | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/templates/mysql.conf.erb b/templates/mysql.conf.erb index 2efa4b1..c70aba0 100644 --- a/templates/mysql.conf.erb +++ b/templates/mysql.conf.erb @@ -17,7 +17,9 @@ compress = <%= compress ? 'yes' : 'no' %> configfile = <%= real_configfile %> <% end %> -<% if nodata %> -nodata = <% nodata.each do |dbtable| -%><%= dbtable %> <% end -%> -<% end %> +<% if nodata.is_a? String -%> +<%= 'nodata = ' + nodata %> +<% elsif nodata.is_a? Array -%> +<%= "nodata = " + nodata.map { |i| "#{i}" }.join(" ") %> +<% end -%> diff --git a/templates/pgsql.conf.erb b/templates/pgsql.conf.erb index 7781ef4..5ffa89c 100644 --- a/templates/pgsql.conf.erb +++ b/templates/pgsql.conf.erb @@ -4,8 +4,10 @@ vsname = <%= vsname %> <% if backupdir %> backupdir = <%= backupdir %> <% end %> -<% if databases %> -databases = <%= databases %> -<% end %> +<% if databases.is_a? String -%> +<%= 'databases = ' + databases %> +<% elsif databases.is_a? Array -%> +<%= "databases = " + databases.map { |i| "#{i}" }.join(" ") %> +<% end -%> compress = <%= compress ? 'yes' : 'no' %> -- cgit v1.2.3