From cb05e48d7ed052c2ddad5a0a20e0d253080675ae Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 11 Mar 2009 16:54:34 -0400
Subject: the default value for sshoptions is 'false' and this value ends up
 getting set into the rdiff config, so 'sshoptions = false' which results in
 the host attempting to connect to a hostname called 'false'.

This change only includes it if the value is not 'false'.
---
 templates/rdiff.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates')

diff --git a/templates/rdiff.conf.erb b/templates/rdiff.conf.erb
index 0e19125..a28917a 100644
--- a/templates/rdiff.conf.erb
+++ b/templates/rdiff.conf.erb
@@ -33,7 +33,7 @@ type = local
     
     if VersionComparer.versioncmp(Puppet.version,'0.24.6') >= 0
         %w{type host directory user sshoptions}.each do |v|
-                if has_variable?(v)
+                if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false"
                 -%>
 <%= v + ' = ' + instance_variable_get("@#{v}").to_s %>
         <%-
-- 
cgit v1.2.3


From 04f10d333b4978a2ce71782c3d94fc2a08f33573 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 14 Apr 2009 15:56:53 -0400
Subject: remove the versioncmp function in the rdiff handler. This was a nice
 attempt to try and support older puppets, but this functionality has not
 stabilized yet, 0.24.8 broke versioncmp and there looks like a new way
 coming. Its easier to be mean.

---
 templates/rdiff.conf.erb | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

(limited to 'templates')

diff --git a/templates/rdiff.conf.erb b/templates/rdiff.conf.erb
index a28917a..a41e969 100644
--- a/templates/rdiff.conf.erb
+++ b/templates/rdiff.conf.erb
@@ -28,25 +28,9 @@ type = local
 <% end -%>
 
 [dest]
-<%- include Puppet::Util::Package
-    class VersionComparer; extend Puppet::Util::Package; end
-    
-    if VersionComparer.versioncmp(Puppet.version,'0.24.6') >= 0
-        %w{type host directory user sshoptions}.each do |v|
-                if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false"
-                -%>
+<%- %w{type host directory user sshoptions}.each do |v|
+    if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%>
 <%= v + ' = ' + instance_variable_get("@#{v}").to_s %>
-        <%-
-                end
-        end
-        %>
-<%- else -%>
-        <%- %w{type host directory user sshoptions}.each do |v|
-                if @scope.lookupvar(v)
-                -%>
-<%= v + ' = ' + @scope.lookupvar(v) %>
-        <%-
-                end
-        end
-        %>
-<%- end -%>
+<%-
+    end
+end -%>
-- 
cgit v1.2.3


From fd86674685ec2b4f59cd442fcac30bc0a6d98507 Mon Sep 17 00:00:00 2001
From: drebs <drebs@riseup.net>
Date: Sun, 12 Jul 2009 16:25:21 -0300
Subject: adding duplicity configfile template.

---
 templates/dup.conf.erb | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 templates/dup.conf.erb

(limited to 'templates')

diff --git a/templates/dup.conf.erb b/templates/dup.conf.erb
new file mode 100644
index 0000000..1c4ccfc
--- /dev/null
+++ b/templates/dup.conf.erb
@@ -0,0 +1,42 @@
+# This configuration file was auto-generated by the Puppet configuration
+# management system.  Any changes you make to this file will be overwritten
+# 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 %>
+
+[gpg]
+<%= '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") %>
+<% end -%>
+
+<% 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") %>
+<% end -%>
+
+[dest]
+<%= 'incremental = ' + incremental if incremental %>
+<%= 'keep = ' + keep if keep %>
+<%= 'bandwithlimit = ' + bandwithlimit if bandwithlimit %>
+<%= 'sshoptions = ' + sshoptions if sshoptions %>
+<%= 'destdir = ' + destdir if destdir %>
+<%= 'desthost = ' + desthost if desthost %>
-- 
cgit v1.2.3


From f3faa38845cbf19292005d6911b3fddaf7589508 Mon Sep 17 00:00:00 2001
From: drebs <drebs@riseup.net>
Date: Mon, 13 Jul 2009 02:36:34 -0300
Subject: adding duplicity handler.

---
 templates/dup.conf.erb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'templates')

diff --git a/templates/dup.conf.erb b/templates/dup.conf.erb
index 1c4ccfc..ce77a5c 100644
--- a/templates/dup.conf.erb
+++ b/templates/dup.conf.erb
@@ -40,3 +40,4 @@
 <%= 'sshoptions = ' + sshoptions if sshoptions %>
 <%= 'destdir = ' + destdir if destdir %>
 <%= 'desthost = ' + desthost if desthost %>
+<%= 'destuser = ' + destuser if destuser %>
-- 
cgit v1.2.3