From 54d77c688d6193da2d8f96f6e1937ecb13225d97 Mon Sep 17 00:00:00 2001 From: Jamie McClelland Date: Tue, 15 Mar 2011 21:13:11 -0400 Subject: Take advantage of nodata option in mysql backupninja config --- templates/mysql.conf.erb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'templates') diff --git a/templates/mysql.conf.erb b/templates/mysql.conf.erb index 14905fd..2efa4b1 100644 --- a/templates/mysql.conf.erb +++ b/templates/mysql.conf.erb @@ -16,3 +16,8 @@ compress = <%= compress ? 'yes' : 'no' %> <% if real_configfile %> configfile = <%= real_configfile %> <% end %> + +<% if nodata %> +nodata = <% nodata.each do |dbtable| -%><%= dbtable %> <% end -%> +<% end %> + -- cgit v1.2.3 From 1a06b02741983aef4c1b0342726f368a6f1de7db Mon Sep 17 00:00:00 2001 From: Jamie McClelland Date: Tue, 15 Mar 2011 21:14:24 -0400 Subject: provide pgsql support --- templates/pgsql.conf.erb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 templates/pgsql.conf.erb (limited to 'templates') diff --git a/templates/pgsql.conf.erb b/templates/pgsql.conf.erb new file mode 100644 index 0000000..7781ef4 --- /dev/null +++ b/templates/pgsql.conf.erb @@ -0,0 +1,11 @@ +<% if vsname %> +vsname = <%= vsname %> +<% end %> +<% if backupdir %> +backupdir = <%= backupdir %> +<% end %> +<% if databases %> +databases = <%= databases %> +<% end %> +compress = <%= compress ? 'yes' : 'no' %> + -- cgit v1.2.3 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(-) (limited to 'templates') 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 From aaa21c19b69d381becc1d801d6664b71ba0db525 Mon Sep 17 00:00:00 2001 From: Jamie McClelland Date: Wed, 30 Mar 2011 10:41:39 -0400 Subject: Useful to control when a cron job runs to avoid all servers backing up at the same time. Also, specifying the backupninja command allows for wrapping it in other commands (e.g. to execute it from within a ssh-agent session so that authentication can happen via the monkeysphere). --- templates/backupninja.cron.erb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 templates/backupninja.cron.erb (limited to 'templates') 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 -- cgit v1.2.3