diff options
| author | Gabriel Filion <gabster@lelutin.ca> | 2015-03-06 17:47:09 -0500 |
|---|---|---|
| committer | Gabriel Filion <gabster@lelutin.ca> | 2015-03-06 17:47:09 -0500 |
| commit | b2c9640c654b0d9ba2f5949ef53480c855a6d1f0 (patch) | |
| tree | 37611e2ca83b20f594ea2d3cbf1316c91437c738 /templates/mysql.conf.erb | |
| parent | 21d8dc8652a9e8910914940cc439e7a02efbf39e (diff) | |
| parent | aaa21c19b69d381becc1d801d6664b71ba0db525 (diff) | |
Merge remote-tracking branch 'mayfirst/master' into merge_mayfirst
Conflicts:
manifests/mysql.pp
manifests/pgsql.pp
templates/pgsql.conf.erb
Diffstat (limited to 'templates/mysql.conf.erb')
| -rw-r--r-- | templates/mysql.conf.erb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/templates/mysql.conf.erb b/templates/mysql.conf.erb index 82dc368..b7ac5e8 100644 --- a/templates/mysql.conf.erb +++ b/templates/mysql.conf.erb @@ -16,3 +16,10 @@ compress = <%= compress ? 'yes' : 'no' %> <% if real_configfile %> configfile = <%= real_configfile %> <% end %> + +<% if nodata.is_a? String -%> +<%= 'nodata = ' + nodata %> +<% elsif nodata.is_a? Array -%> +<%= "nodata = " + nodata.map { |i| "#{i}" }.join(" ") %> +<% end -%> + |