diff options
| author | Jamie McClelland <jm@mayfirst.org> | 2011-03-19 23:55:22 -0400 |
|---|---|---|
| committer | Jamie McClelland <jm@mayfirst.org> | 2011-03-19 23:55:22 -0400 |
| commit | 625ffd23ee88b26287fadd0db33d1ceababbac21 (patch) | |
| tree | fc460d1bb0bd5cc50fb10f97124ad44d00904a88 | |
| parent | 1a06b02741983aef4c1b0342726f368a6f1de7db (diff) | |
| download | puppet-backupninja-625ffd23ee88b26287fadd0db33d1ceababbac21.tar.gz puppet-backupninja-625ffd23ee88b26287fadd0db33d1ceababbac21.tar.bz2 | |
We might get either a var or an array - we should be able to take
either.
| -rw-r--r-- | templates/mysql.conf.erb | 8 | ||||
| -rw-r--r-- | 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' %> |