aboutsummaryrefslogtreecommitdiff
path: root/templates/puppet
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-03-04 14:34:08 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-03-04 14:34:08 -0300
commit7954b5ce0c72c03493c3bff98f3c6ea9f1d665d0 (patch)
tree8cd7fb03c6023af86f05b0ae19d5022d7dc53991 /templates/puppet
parent724c2a62eeb5beac50e5d4837e9b4f1c28f7bd14 (diff)
downloadpuppet-bootstrap-7954b5ce0c72c03493c3bff98f3c6ea9f1d665d0.tar.gz
puppet-bootstrap-7954b5ce0c72c03493c3bff98f3c6ea9f1d665d0.tar.bz2
Cleaning node templates, storage and test nodes on Vagrant, TODO update
Diffstat (limited to 'templates/puppet')
-rw-r--r--templates/puppet/master.pp.erb6
-rw-r--r--templates/puppet/proxy.pp.erb6
-rw-r--r--templates/puppet/server.pp.erb7
-rw-r--r--templates/puppet/storage.pp.erb6
-rw-r--r--templates/puppet/test.pp.erb6
-rw-r--r--templates/puppet/web.pp.erb6
6 files changed, 0 insertions, 37 deletions
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",