diff options
-rw-r--r-- | manifests/rsync.pp | 7 | ||||
-rw-r--r-- | templates/backupninja.cron.erb | 2 | ||||
-rw-r--r-- | templates/dup.conf.erb | 60 | ||||
-rw-r--r-- | templates/labelmount.conf.erb | 4 | ||||
-rw-r--r-- | templates/maildir.conf.erb | 4 | ||||
-rw-r--r-- | templates/mysql.conf.erb | 18 | ||||
-rw-r--r-- | templates/pgsql.conf.erb | 18 | ||||
-rw-r--r-- | templates/rdiff.conf.erb | 30 | ||||
-rw-r--r-- | templates/rsync.conf.erb | 4 | ||||
-rw-r--r-- | templates/svn.conf.erb | 2 | ||||
-rw-r--r-- | templates/sys.conf.erb | 14 | ||||
-rw-r--r-- | templates/umount.conf.erb | 2 |
12 files changed, 82 insertions, 83 deletions
diff --git a/manifests/rsync.pp b/manifests/rsync.pp index fc59950..a643415 100644 --- a/manifests/rsync.pp +++ b/manifests/rsync.pp @@ -80,15 +80,14 @@ define backupninja::rsync( $order = 90, ensure_resource('package', 'rsync', {'ensure' => $backupninja::ensure_rsync_version}) # Right now just local origin with remote destination is supported. - $from = 'local' - $dest = 'remote' + $from = 'local' + $dest = 'remote' + $backupdir = "${home}/${subfolder}/" case $dest { 'remote': { case $host { false: { err("need to define a host for remote backups!") } } - $directory = "${home}/${subfolder}/" - backupninja::server::sandbox { "${user}-${name}": user => $user, host => $host, diff --git a/templates/backupninja.cron.erb b/templates/backupninja.cron.erb index ec392ca..3355d82 100644 --- a/templates/backupninja.cron.erb +++ b/templates/backupninja.cron.erb @@ -3,4 +3,4 @@ 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 +<%= @min %> <%= @hour %> <%= @dom %> <%= @month %> <%= @dow %> root if [ -x <%= @backupninja_test_cmd %> ]; then <%= @backupninja_cmd %>; fi diff --git a/templates/dup.conf.erb b/templates/dup.conf.erb index 4f15e78..533bb74 100644 --- a/templates/dup.conf.erb +++ b/templates/dup.conf.erb @@ -3,44 +3,44 @@ # the next time Puppet runs. Please make configuration changes to this # service in Puppet. -<%= 'options = ' + options if options %> -<%= 'nicelevel = ' + nicelevel if nicelevel %> -<%= 'testconnect = ' + testconnect if testconnect %> -<%= 'tmpdir = ' + tmpdir if tmpdir %> +<%= 'options = ' + @options if @options %> +<%= 'nicelevel = ' + @nicelevel if @nicelevel %> +<%= 'testconnect = ' + @testconnect if @testconnect %> +<%= 'tmpdir = ' + @tmpdir if @tmpdir %> [gpg] -<%= 'sign = ' + sign if sign %> -<%= 'encryptkey = ' + encryptkey if encryptkey %> -<%= 'signkey = ' + signkey if signkey %> -<%= 'password = ' + password if password %> +<%= 'sign = ' + @sign if @sign %> +<%= 'encryptkey = ' + @encryptkey if @encryptkey %> +<%= 'signkey = ' + @signkey if @signkey %> +<%= 'password = ' + @password if @password %> [source] -<% if include.is_a? String -%> -<%= 'include = ' + include %> -<% elsif include.is_a? Array -%> -<%= include.map { |i| "include = #{i}" }.join("\n") %> +<% if @include.is_a? String -%> +<%= 'include = ' + @include %> +<% elsif @include.is_a? Array -%> +<%= @include.map { |i| "include = #{i}" }.join("\n") %> <% end -%> -<% if exclude.is_a? String -%> -<%= 'exclude = ' + exclude %> -<% elsif exclude.is_a? Array -%> -<%= exclude.map { |i| "exclude = #{i}" }.join("\n") %> +<% if @exclude.is_a? String -%> +<%= 'exclude = ' + @exclude %> +<% elsif @exclude.is_a? Array -%> +<%= @exclude.map { |i| "exclude = #{i}" }.join("\n") %> <% end -%> -<% if vsinclude.is_a? String -%> -<%= 'vsinclude = ' + vsinclude %> -<% elsif vsinclude.is_a? Array -%> -<%= vsinclude.map { |i| "vsinclude = #{i}" }.join("\n") %> +<% if @vsinclude.is_a? String -%> +<%= 'vsinclude = ' + @vsinclude %> +<% elsif @vsinclude.is_a? Array -%> +<%= @vsinclude.map { |i| "vsinclude = #{i}" }.join("\n") %> <% end -%> [dest] -<%= 'incremental = ' + incremental if incremental %> -<%= 'increments = ' + increments if increments %> -<%= 'keep = ' + keep if keep %> -<%= 'keepincroffulls = ' + keepincroffulls if keepincroffulls %> -<%= 'bandwidthlimit = ' + bandwidthlimit if bandwidthlimit %> -<%= 'sshoptions = ' + sshoptions if sshoptions %> -<%= 'destdir = ' + destdir if destdir %> -<%= 'desthost = ' + desthost if desthost %> -<%= 'destuser = ' + destuser if destuser %> -<%= 'desturl = ' + desturl if desturl %> +<%= 'incremental = ' + @incremental if @incremental %> +<%= 'increments = ' + @increments if @increments %> +<%= 'keep = ' + @keep if @keep %> +<%= 'keepincroffulls = ' + @keepincroffulls if @keepincroffulls %> +<%= 'bandwidthlimit = ' + @bandwidthlimit if @bandwidthlimit %> +<%= 'sshoptions = ' + @sshoptions if @sshoptions %> +<%= 'destdir = ' + @destdir if @destdir %> +<%= 'desthost = ' + @desthost if @desthost %> +<%= 'destuser = ' + @destuser if @destuser %> +<%= 'desturl = ' + @desturl if @desturl %> diff --git a/templates/labelmount.conf.erb b/templates/labelmount.conf.erb index e40c49d..b205bb3 100644 --- a/templates/labelmount.conf.erb +++ b/templates/labelmount.conf.erb @@ -1,2 +1,2 @@ -label = <%= label %> -dest = <%= dest %> +label = <%= @label %> +dest = <%= @dest %> diff --git a/templates/maildir.conf.erb b/templates/maildir.conf.erb index 351f382..4d636eb 100644 --- a/templates/maildir.conf.erb +++ b/templates/maildir.conf.erb @@ -9,6 +9,6 @@ end end -%> -remove = <%= remove ? 'yes' : 'no' %> -multiconnection = <%= multiconnection ? 'yes' : 'no' %> +remove = <%= @remove ? 'yes' : 'no' %> +multiconnection = <%= @multiconnection ? 'yes' : 'no' %> diff --git a/templates/mysql.conf.erb b/templates/mysql.conf.erb index b7ac5e8..ad47f15 100644 --- a/templates/mysql.conf.erb +++ b/templates/mysql.conf.erb @@ -9,17 +9,17 @@ end end -%> -hotcopy = <%= hotcopy ? 'yes' : 'no' %> -sqldump = <%= sqldump ? 'yes' : 'no' %> -compress = <%= compress ? 'yes' : 'no' %> +hotcopy = <%= @hotcopy ? 'yes' : 'no' %> +sqldump = <%= @sqldump ? 'yes' : 'no' %> +compress = <%= @compress ? 'yes' : 'no' %> -<% if real_configfile %> -configfile = <%= real_configfile %> +<% 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(" ") %> +<% 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 5ffa89c..e75f7d6 100644 --- a/templates/pgsql.conf.erb +++ b/templates/pgsql.conf.erb @@ -1,13 +1,13 @@ -<% if vsname %> -vsname = <%= vsname %> +<% if @vsname %> +vsname = <%= @vsname %> <% end %> -<% if backupdir %> -backupdir = <%= backupdir %> +<% if @backupdir %> +backupdir = <%= @backupdir %> <% end %> -<% if databases.is_a? String -%> -<%= 'databases = ' + databases %> -<% elsif databases.is_a? Array -%> -<%= "databases = " + databases.map { |i| "#{i}" }.join(" ") %> +<% if @databases.is_a? String -%> +<%= 'databases = ' + @databases %> +<% elsif @databases.is_a? Array -%> +<%= "databases = " + @databases.map { |i| "#{i}" }.join(" ") %> <% end -%> -compress = <%= compress ? 'yes' : 'no' %> +compress = <%= @compress ? 'yes' : 'no' %> diff --git a/templates/rdiff.conf.erb b/templates/rdiff.conf.erb index 23c336f..9d6abea 100644 --- a/templates/rdiff.conf.erb +++ b/templates/rdiff.conf.erb @@ -3,30 +3,30 @@ # the next time Puppet runs. Please make configuration changes to this # service in Puppet. -<%= 'options = ' + options if options %> +<%= 'options = ' + @options if @options %> -<%= extras if extras %> +<%= @extras if @extras %> [source] type = local -<%= 'keep = ' + keep if keep %> +<%= 'keep = ' + @keep if @keep %> -<% if include.is_a? String -%> -<%= 'include = ' + include %> -<% elsif include.is_a? Array -%> -<%= include.map { |i| "include = #{i}" }.join("\n") %> +<% if @include.is_a? String -%> +<%= 'include = ' + @include %> +<% elsif @include.is_a? Array -%> +<%= @include.map { |i| "include = #{i}" }.join("\n") %> <% end -%> -<% if exclude.is_a? String -%> -<%= 'exclude = ' + exclude %> -<% elsif exclude.is_a? Array -%> -<%= exclude.map { |i| "exclude = #{i}" }.join("\n") %> +<% if @exclude.is_a? String -%> +<%= 'exclude = ' + @exclude %> +<% elsif @exclude.is_a? Array -%> +<%= @exclude.map { |i| "exclude = #{i}" }.join("\n") %> <% end -%> -<% if vsinclude.is_a? String -%> -<%= 'vsinclude = ' + vsinclude %> -<% elsif vsinclude.is_a? Array -%> -<%= vsinclude.map { |i| "vsinclude = #{i}" }.join("\n") %> +<% if @vsinclude.is_a? String -%> +<%= 'vsinclude = ' + @vsinclude %> +<% elsif @vsinclude.is_a? Array -%> +<%= @vsinclude.map { |i| "vsinclude = #{i}" }.join("\n") %> <% end -%> [dest] diff --git a/templates/rsync.conf.erb b/templates/rsync.conf.erb index 778676f..0a7173c 100644 --- a/templates/rsync.conf.erb +++ b/templates/rsync.conf.erb @@ -12,8 +12,8 @@ end -%> [source] -<% unless from.empty? and from.to_s != "false" -%> -from = <%= from %> +<% unless @from.empty? and @from.to_s != "false" -%> +from = <%= f@rom %> <% end -%> <%- %w{include exclude}.each do |v| if has_variable?(v) diff --git a/templates/svn.conf.erb b/templates/svn.conf.erb index 465cc67..67cdcd7 100644 --- a/templates/svn.conf.erb +++ b/templates/svn.conf.erb @@ -7,4 +7,4 @@ if send(v) -%><%= v + ' = ' + send(v) + "\n" %><% end -end -%>
\ No newline at end of file +end -%> diff --git a/templates/sys.conf.erb b/templates/sys.conf.erb index a684e8b..b8a542a 100644 --- a/templates/sys.conf.erb +++ b/templates/sys.conf.erb @@ -9,10 +9,10 @@ end end -%> -packages = <%= packages ? 'yes' : 'no' %> -partitions = <%= partitions ? 'yes' : 'no' %> -dosfdisk = <%= dosfdisk ? 'yes' : 'no' %> -hardware = <%= hardware ? 'yes' : 'no' %> -dohwinfo = <%= dohwinfo ? 'yes' : 'no' %> -luksheaders = <%= doluks ? 'yes' : 'no' %> -lvm = <%= dolvm ? 'yes' : 'no' %> +packages = <%= @packages ? 'yes' : 'no' %> +partitions = <%= @partitions ? 'yes' : 'no' %> +dosfdisk = <%= @dosfdisk ? 'yes' : 'no' %> +hardware = <%= @hardware ? 'yes' : 'no' %> +dohwinfo = <%= @dohwinfo ? 'yes' : 'no' %> +luksheaders = <%= @doluks ? 'yes' : 'no' %> +lvm = <%= @dolvm ? 'yes' : 'no' %> diff --git a/templates/umount.conf.erb b/templates/umount.conf.erb index 59bfaec..1e59c36 100644 --- a/templates/umount.conf.erb +++ b/templates/umount.conf.erb @@ -1 +1 @@ -dir = <%= dest %> +dir = <%= @dest %> |