summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-02-11 23:50:15 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-02-11 23:50:15 +0000
commit81ae3977e61d13256bc079228ad938a5655a8b41 (patch)
tree7649874c793a456b6401291caf89c0c6195a598c
parent1756bec99b9136463e5d35f1de4119b813ce40cc (diff)
downloadpuppet-81ae3977e61d13256bc079228ad938a5655a8b41.tar.gz
puppet-81ae3977e61d13256bc079228ad938a5655a8b41.tar.xz
puppet-81ae3977e61d13256bc079228ad938a5655a8b41.zip
Applying doc patch from #494.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2183 980ebf18-57e1-0310-9a29-db15c13687c0
-rw-r--r--lib/puppet/metatype/metaparams.rb3
-rwxr-xr-xlib/puppet/type/mount.rb12
-rw-r--r--lib/puppet/type/service.rb7
3 files changed, 17 insertions, 5 deletions
diff --git a/lib/puppet/metatype/metaparams.rb b/lib/puppet/metatype/metaparams.rb
index 4c85699ba..b780316af 100644
--- a/lib/puppet/metatype/metaparams.rb
+++ b/lib/puppet/metatype/metaparams.rb
@@ -363,6 +363,9 @@ class Puppet::Type
subscribe => file[nagconf]
}
}
+
+ Currently the ``exec``, ``mount`` and ``service`` type support
+ refreshing.
"
end
diff --git a/lib/puppet/type/mount.rb b/lib/puppet/type/mount.rb
index c7f122e36..6e882687d 100755
--- a/lib/puppet/type/mount.rb
+++ b/lib/puppet/type/mount.rb
@@ -3,6 +3,14 @@ require 'puppet/type/parsedtype'
module Puppet
# We want the mount to refresh when it changes.
newtype(:mount, :self_refresh => true) do
+ @doc = "Manages mounted filesystems, including putting mount
+ information into the mount table. The actual behavior depends
+ on the value of the 'ensure' parameter.
+
+ Note that if a ``mount`` receives an event from another resource,
+ it will try to remount the filesystems if ``ensure => mounted`` is
+ set."
+
# Use the normal parent class, because we actually want to
# call code when sync() is called.
newproperty(:ensure) do
@@ -161,10 +169,6 @@ module Puppet
end
end
- @doc = "Manages mounted mounts, including putting mount
- information into the mount table. The actual behavior depends
- on the value of the 'ensure' parameter."
-
def refresh
# Only remount if we're supposed to be mounted.
if ens = @parameters[:ensure] and ens.should == :mounted
diff --git a/lib/puppet/type/service.rb b/lib/puppet/type/service.rb
index 182831392..ef97adcf7 100644
--- a/lib/puppet/type/service.rb
+++ b/lib/puppet/type/service.rb
@@ -15,7 +15,12 @@ module Puppet
'status' command, then Puppet will look in the process table for a
command matching the service name), but the more information you
can provide the better behaviour you will get. Or, you can just
- use a platform that has very good service support."
+ use a platform that has very good service support.
+
+ Note that if a ``service`` receives an event from another resource,
+ the service will get restarted. The actual command to restart the
+ service depends on the platform. You can provide a special command
+ for restarting with the ``restart`` attribute."
attr_reader :stat