From 7954b5ce0c72c03493c3bff98f3c6ea9f1d665d0 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 4 Mar 2014 14:34:08 -0300
Subject: Cleaning node templates, storage and test nodes on Vagrant, TODO
 update

---
 templates/puppet/master.pp.erb  | 6 ------
 templates/puppet/proxy.pp.erb   | 6 ------
 templates/puppet/server.pp.erb  | 7 -------
 templates/puppet/storage.pp.erb | 6 ------
 templates/puppet/test.pp.erb    | 6 ------
 templates/puppet/web.pp.erb     | 6 ------
 6 files changed, 37 deletions(-)

(limited to 'templates/puppet')

diff --git a/templates/puppet/master.pp.erb b/templates/puppet/master.pp.erb
index 3f7b4d9..5865723 100644
--- a/templates/puppet/master.pp.erb
+++ b/templates/puppet/master.pp.erb
@@ -2,12 +2,6 @@ node '<%= hostname %>-master.<%= domain %>' {
   $main_master    = true
   include nodo::master
 
-  # encrypted local backups
-  #backup::duplicity { "localhost":
-  #  encryptkey => "ABCDEF12",
-  #  password   => 'xxxyyy',
-  #}
-  
   # encrypted data remote backup
   #backup::rdiff { "other-host":
   #  port   => "10102",
diff --git a/templates/puppet/proxy.pp.erb b/templates/puppet/proxy.pp.erb
index a108a73..908c2ec 100644
--- a/templates/puppet/proxy.pp.erb
+++ b/templates/puppet/proxy.pp.erb
@@ -5,12 +5,6 @@ node '<%= hostname %>-proxy.<%= domain %>' {
 
   include nodo::proxy
 
-  # encrypted local backups
-  #backup::duplicity { "localhost":
-  #  encryptkey => "ABCDEF12",
-  #  password   => 'xxxyyy',
-  #}
-  
   # encrypted data remote backup
   #backup::rdiff { "other-host":
   #  port   => "10102",
diff --git a/templates/puppet/server.pp.erb b/templates/puppet/server.pp.erb
index 9aec40a..fcd21e0 100644
--- a/templates/puppet/server.pp.erb
+++ b/templates/puppet/server.pp.erb
@@ -34,15 +34,8 @@ node '<%= hostname %>.<%= domain %>' {
   #  memory_limit => 500,
   #}
 
-  # encrypted local backups
-  #backup::duplicity { "localhost":
-  #  encryptkey => "ABCDEF12",
-  #  password   => 'xxxyyy',
-  #}
-  
   # encrypted data remote backup
   #backup::rdiff { "other-host":
   #  port   => "10105",
   #}
-
 }
diff --git a/templates/puppet/storage.pp.erb b/templates/puppet/storage.pp.erb
index ab3ddc9..be93335 100644
--- a/templates/puppet/storage.pp.erb
+++ b/templates/puppet/storage.pp.erb
@@ -5,12 +5,6 @@ node '<%= hostname %>-storage.<%= domain %>' {
 
   include nodo::storage
 
-  # encrypted local backups
-  #backup::duplicity { "localhost":
-  #  encryptkey => "ABCDEF12",
-  #  password   => 'xxxyyy',
-  #}
-  
   # encrypted data remote backup
   #backup::rdiff { "other-host":
   #  port   => "10102",
diff --git a/templates/puppet/test.pp.erb b/templates/puppet/test.pp.erb
index 0440ee4..816eca9 100644
--- a/templates/puppet/test.pp.erb
+++ b/templates/puppet/test.pp.erb
@@ -5,12 +5,6 @@ node '<%= hostname %>-test.<%= domain %>' {
 
   include nodo::test
 
-  # encrypted local backups
-  #backup::duplicity { "localhost":
-  #  encryptkey => "ABCDEF12",
-  #  password   => 'xxxyyy',
-  #}
-  
   # encrypted data remote backup
   #backup::rdiff { "other-host":
   #  port   => "10102",
diff --git a/templates/puppet/web.pp.erb b/templates/puppet/web.pp.erb
index 098ec9c..afc328b 100644
--- a/templates/puppet/web.pp.erb
+++ b/templates/puppet/web.pp.erb
@@ -5,12 +5,6 @@ node '<%= hostname %>-web.<%= domain %>' {
 
   include nodo::web
 
-  # encrypted local backups
-  #backup::duplicity { "localhost":
-  #  encryptkey => "ABCDEF12",
-  #  password   => 'xxxyyy',
-  #}
-  
   # encrypted data remote backup
   #backup::rdiff { "other-host":
   #  port   => "10102",
-- 
cgit v1.2.3