summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-07-06 04:39:59 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-07-06 04:39:59 +0000
commite57f6e78ce305850b93e7da683a13597eb41936f (patch)
tree879a6295d081d06e12f49894cff0e2d0ca1871bc /lib
parent9b7f428843cb117e2de14e27153631827ee0b865 (diff)
More documentation updates. I think this is sufficient for replacement of the plone site.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1373 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/type.rb1
-rwxr-xr-xlib/puppet/type/pfilebucket.rb15
2 files changed, 14 insertions, 2 deletions
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index 6a9d1c47b..91b75e9d4 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -2233,7 +2233,6 @@ class Type < Puppet::Element
source => \"puppet://server/module/nagios.conf\",
alias => nagconf # just to make things easier for me
}
-
service { nagios:
running => true,
subscribe => file[nagconf]
diff --git a/lib/puppet/type/pfilebucket.rb b/lib/puppet/type/pfilebucket.rb
index c337ffa77..d8c676114 100755
--- a/lib/puppet/type/pfilebucket.rb
+++ b/lib/puppet/type/pfilebucket.rb
@@ -14,7 +14,20 @@ module Puppet
accidentally removed files (e.g., you look in the log for the md5
sum and retrieve the file with that sum from the filebucket), but
when transactions are fully supported filebuckets will be used to
- undo transactions."
+ undo transactions.
+
+ You will normally want to define a single filebucket for your
+ whole network and then use that as the default backup location:
+
+ # Define the bucket
+ filebucket { main: server => puppet }
+
+ # Specify it as the default target
+ File { backup => main }
+
+ Puppetmaster servers create a filebucket by default, so this will
+ work in a default configuration.
+ "
@states = []