Merge remote-tracking branch 'mayfirst/master' into merge_mayfirst

Conflicts:
	manifests/mysql.pp
	manifests/pgsql.pp
	templates/pgsql.conf.erb

3 files changed, 18 insertions, 3 deletions

diff --git a/templates/backupninja.cron.erb b/templates/backupninja.cron.erb
new file mode 100644
index 0000000..ec392ca
--- /dev/null
+++ b/templates/backupninja.cron.erb
@@ -0,0 +1,6 @@
+# /etc/cron.d/backupninja -- cron tab entry for package backupninja
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+# # run backupninja 
+<%= min %> <%= hour %> <%= dom %> <%= month %> <%= dow %> root if [ -x <%= backupninja_test_cmd %> ]; then <%= backupninja_cmd %>; fi
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 -%>
+
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' %>