puppet 2.6.0 → 2.6.1

data/lib/puppet/type/resources.rb

@@ -1,12 +1,9 @@
-#  Created by Luke Kanies on 2006-12-12.
-#  Copyright (c) 2006. All rights reserved.
-
 require 'puppet'
 
 Puppet::Type.newtype(:resources) do
   @doc = "This is a metatype that can manage other resource types.  Any
     metaparams specified here will be passed on to any generated resources,
-    so you can purge umanaged resources but set ``noop`` to true so the
+    so you can purge umanaged resources but set `noop` to true so the
     purging is only logged and does not actually happen."
 
 
@@ -132,4 +129,3 @@ Puppet::Type.newtype(:resources) do
     %w{root nobody bin noaccess daemon sys}
   end
 end
-

data/lib/puppet/type/schedule.rb

@@ -196,17 +196,17 @@ module Puppet
         Note that the period defines how often a given resource will get
         applied but not when; if you would like to restrict the hours
         that a given resource can be applied (e.g., only at night during
-        a maintenance window) then use the ``range`` attribute.
+        a maintenance window) then use the `range` attribute.
 
         If the provided periods are not sufficient, you can provide a
         value to the *repeat* attribute, which will cause Puppet to
         schedule the affected resources evenly in the period the
-        specified number of times.  Take this schedule::
+        specified number of times.  Take this schedule:
 
-          schedule { veryoften:
-            period => hourly,
-            repeat => 6
-          }
+            schedule { veryoften:
+              period => hourly,
+              repeat => 6
+            }
 
         This can cause Puppet to apply that resource up to every 10 minutes.
 
@@ -215,7 +215,7 @@ module Puppet
         internal factors might prevent it from actually running that
         often (e.g., long-running Puppet runs will squash conflictingly scheduled runs).
 
-        See the ``periodmatch`` attribute for tuning whether to match
+        See the `periodmatch` attribute for tuning whether to match
         times by their distance apart or by their specific value."
 
       newvalues(:hourly, :daily, :weekly, :monthly, :never)
@@ -307,10 +307,10 @@ module Puppet
       Puppet.debug "Creating default schedules"
 
             result << self.new(
-                
+
         :name => "puppet",
         :period => :hourly,
-        
+
         :repeat => "2"
       )
 
@@ -318,9 +318,7 @@ module Puppet
       @parameters.find { |p| p.name == :period }.value_collection.values.each { |value|
 
               result << self.new(
-                
           :name => value.to_s,
-        
           :period => value
         )
       }
@@ -349,4 +347,3 @@ module Puppet
     end
   end
 end
-

data/lib/puppet/type/selboolean.rb

@@ -1,11 +1,7 @@
-#
-# Simple module for manageing SELinux booleans
-#
-
 module Puppet
   newtype(:selboolean) do
     @doc = "Manages SELinux booleans on systems with SELinux support.  The supported booleans
-      are any of the ones found in /selinux/booleans/."
+      are any of the ones found in `/selinux/booleans/`."
 
     newparam(:name) do
       desc "The name of the SELinux boolean to be managed."
@@ -20,7 +16,7 @@ module Puppet
 
     newparam(:persistent) do
       desc "If set true, SELinux booleans will be written to disk and persist accross reboots.
-        The default is ``false``."
+        The default is `false`."
 
       defaultto :false
       newvalues(:true, :false)
@@ -28,4 +24,3 @@ module Puppet
 
   end
 end
-

data/lib/puppet/type/selmodule.rb

@@ -18,7 +18,7 @@ Puppet::Type.newtype(:selmodule) do
   newparam(:selmoduledir) do
 
     desc "The directory to look for the compiled pp module file in.
-      Currently defaults to /usr/share/selinux/targeted.  If selmodulepath
+      Currently defaults to `/usr/share/selinux/targeted`.  If selmodulepath
       is not specified the module will be looked for in this directory in a
       in a file called NAME.pp, where NAME is the value of the name parameter."
 
@@ -34,9 +34,9 @@ Puppet::Type.newtype(:selmodule) do
 
   newproperty(:syncversion) do
 
-    desc "If set to ``true``, the policy will be reloaded if the
+    desc "If set to `true`, the policy will be reloaded if the
     version found in the on-disk file differs from the loaded
-    version.  If set to ``false`` (the default) the the only check
+    version.  If set to `false` (the default) the the only check
     that will be made is if the policy is loaded at all or not."
 
     newvalue(:true)
@@ -51,4 +51,3 @@ Puppet::Type.newtype(:selmodule) do
     end
   end
 end
-

data/lib/puppet/type/service.rb

@@ -17,10 +17,10 @@ module Puppet
       can provide the better behaviour you will get.  Or, you can just
       use a platform that has very good service support.
 
-      Note that if a ``service`` receives an event from another resource,
+      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."
+      for restarting with the `restart` attribute."
 
     feature :refreshable, "The provider can restart the service.",
       :methods => [:restart]
@@ -83,7 +83,7 @@ module Puppet
     newparam(:binary) do
       desc "The path to the daemon.  This is only used for
         systems that do not support init scripts.  This binary will be
-        used to start the service if no ``start`` parameter is
+        used to start the service if no `start` parameter is
         provided."
     end
 
@@ -94,7 +94,7 @@ module Puppet
         not support any kind of status command; thus, you must specify
         manually whether the service you are running has such a
         command (or you can specify a specific command using the
-        ``status`` parameter).
+        `status` parameter).
 
         If you do not specify anything, then the service name will be
         looked for in the process table."
@@ -140,7 +140,7 @@ module Puppet
     end
     newparam(:start) do
       desc "Specify a *start* command manually.  Most service subsystems
-        support a ``start`` command, so this will not need to be
+        support a `start` command, so this will not need to be
         specified."
     end
     newparam(:status) do
@@ -156,14 +156,14 @@ module Puppet
 
     newparam(:control) do
       desc "The control variable used to manage services (originally for HP-UX).
-        Defaults to the upcased service name plus ``START`` replacing dots with
-        underscores, for those providers that support the ``controllable`` feature."
+        Defaults to the upcased service name plus `START` replacing dots with
+        underscores, for those providers that support the `controllable` feature."
       defaultto { resource.name.gsub(".","_").upcase + "_START" if resource.provider.controllable? }
     end
 
     newparam :hasrestart do
-      desc "Specify that an init script has a ``restart`` option.  Otherwise,
-        the init script's ``stop`` and ``start`` methods are used."
+      desc "Specify that an init script has a `restart` option.  Otherwise,
+        the init script's `stop` and `start` methods are used."
       newvalues(:true, :false)
     end
 

data/lib/puppet/type/ssh_authorized_key.rb

@@ -34,8 +34,8 @@ module Puppet
     newproperty(:target) do
       desc "The absolute filename in which to store the SSH key. This
       property is optional and should only be used in cases where keys
-      are stored in a non-standard location (ie not in
-      ~user/.ssh/authorized_keys)."
+      are stored in a non-standard location (i.e.` not in
+      `~user/.ssh/authorized_keys`)."
 
       defaultto :absent
 
@@ -96,4 +96,3 @@ module Puppet
     end
   end
 end
-

data/lib/puppet/type/sshkey.rb

@@ -1,8 +1,8 @@
 module Puppet
   newtype(:sshkey) do
     @doc = "Installs and manages ssh host keys.  At this point, this type
-      only knows how to install keys into /etc/ssh/ssh_known_hosts, and
-      it cannot manage user authorized keys yet."
+      only knows how to install keys into `/etc/ssh/ssh_known_hosts`.  See 
+      the `ssh_authorized_key` type to manage authorized keys."
 
     ensurable
 
@@ -23,9 +23,7 @@ module Puppet
     # to see if we can automatically glean any aliases.
     newproperty(:host_aliases) do
       desc 'Any aliases the host might have.  Multiple values must be
-        specified as an array.  Note that this property is not the same as
-        the "alias" metaparam; use this property to add aliases to a host
-        on disk, and "alias" to aliases for use in your Puppet scripts.'
+        specified as an array.'
 
       attr_accessor :meta
 
@@ -56,7 +54,7 @@ module Puppet
 
     newproperty(:target) do
       desc "The file in which to store the ssh key.  Only used by
-        the ``parsed`` provider."
+        the `parsed` provider."
 
       defaultto { if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
         @resource.class.defaultprovider.default_target
@@ -67,4 +65,3 @@ module Puppet
     end
   end
 end
-

data/lib/puppet/type/stage.rb

@@ -1,11 +1,12 @@
 Puppet::Type.newtype(:stage) do
   desc "A resource type for specifying run stages.  The actual stage should
-  be specified on resources::
-    class { foo: stage => pre }
+  be specified on resources:
+      
+      class { foo: stage => pre }
 
-  And you must manually control stage order::
+  And you must manually control stage order:
 
-    stage { pre: before => Stage[main] }
+      stage { pre: before => Stage[main] }
 
   You automatically get a 'main' stage created, and by default all resources
   get inserted into that stage.

data/lib/puppet/type/tidy.rb

@@ -5,7 +5,7 @@ Puppet::Type.newtype(:tidy) do
     criteria are OR'd together, so a file that is too large but is not
     old enough will still get tidied.
 
-    If you don't specify either 'age' or 'size', then all files will
+    If you don't specify either `age` or `size`, then all files will
     be removed.
 
     This resource type works by generating a file resource for every file
@@ -47,7 +47,7 @@ Puppet::Type.newtype(:tidy) do
       at least one of the patterns specified. Multiple patterns can
       be specified using an array.
 
-      Example::
+      Example:
 
           tidy { \"/tmp\":
             age => \"1w\",
@@ -55,7 +55,7 @@ Puppet::Type.newtype(:tidy) do
             matches => [ \"[0-9]pub*.tmp\", \"*.temp\", \"tmpfile?\" ]
           }
 
-      This removes files from \/tmp if they are one week old or older,
+      This removes files from `/tmp` if they are one week old or older,
       are not in a subdirectory and match one of the shell globs given.
 
       Note that the patterns are matched against the basename of each

data/lib/puppet/type/user.rb

@@ -12,7 +12,7 @@ module Puppet
 
       This resource type uses the prescribed native tools for creating
       groups and generally uses POSIX APIs for retrieving information
-      about them.  It does not directly modify /etc/passwd or anything."
+      about them.  It does not directly modify `/etc/passwd` or anything."
 
     feature :allows_duplicates,
       "The provider supports duplicate users with the same UID."
@@ -381,4 +381,3 @@ module Puppet
     end
   end
 end
-

data/lib/puppet/type/whit.rb

@@ -0,0 +1,7 @@
+Puppet::Type.newtype(:whit) do
+  desc "The smallest possible resource type, for when you need a resource and naught else."
+
+  newparam :name do
+    desc "The name of the whit, because it must have one."
+  end
+end

data/lib/puppet/type/yumrepo.rb

@@ -52,8 +52,9 @@ module Puppet
 
   newtype(:yumrepo) do
     @doc = "The client-side description of a yum repository. Repository
-      configurations are found by parsing /etc/yum.conf and
-      the files indicated by reposdir in that file (see yum.conf(5) for details)
+      configurations are found by parsing `/etc/yum.conf` and
+      the files indicated by the `reposdir` option in that file 
+      (see yum.conf(5) for details)
 
       Most parameters are identical to the ones documented
       in yum.conf(5)
@@ -85,7 +86,7 @@ module Puppet
       clear
       inifile.each_section do |s|
         next if s.name == "main"
-        obj = create(:name => s.name, :audit => check)
+        obj = new(:name => s.name, :audit => check)
         current_values = obj.retrieve
         obj.eachproperty do |property|
           if current_values[property].nil?
@@ -294,6 +295,12 @@ module Puppet
       newvalue(%r{(0|1)}) { }
     end
 
+     newproperty(:http_caching, :parent => Puppet::IniProperty) do
+       desc "Either 'packages' or 'all' or 'none'.\n#{ABSENT_DOC}" 
+       newvalue(:absent) { self.should = :absent }
+       newvalue(%r(packages|all|none)) { }
+     end
+
     newproperty(:timeout, :parent => Puppet::IniProperty) do
       desc "Number of seconds to wait for a connection before timing
         out.\n#{ABSENT_DOC}"
@@ -324,6 +331,12 @@ module Puppet
       newvalue(%r{[1-9][0-9]?}) { }
     end
 
+    newproperty(:cost, :parent => Puppet::IniProperty) do
+      desc "Cost of this repository.\n#{ABSENT_DOC}"
+      newvalue(:absent) { self.should = :absent }
+      newvalue(%r{\d+}) { }
+    end
+
     newproperty(:proxy, :parent => Puppet::IniProperty) do
       desc "URL to the proxy server for this repository.\n#{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }

data/lib/puppet/type/zfs.rb

@@ -33,7 +33,7 @@ module Puppet
     end
 
     newproperty(:snapdir) do
-      desc "The sharenfs property."
+      desc "The snapdir property."
     end
 
     autorequire(:zpool) do
@@ -48,4 +48,3 @@ module Puppet
     end
   end
 end
-

data/lib/puppet/type/zone.rb

@@ -69,9 +69,9 @@ Puppet::Type.newtype(:zone) do
 
   ensurable do
     desc "The running state of the zone.  The valid states directly reflect
-      the states that ``zoneadm`` provides.  The states are linear,
-      in that a zone must be ``configured`` then ``installed``, and
-      only then can be ``running``.  Note also that ``halt`` is currently
+      the states that `zoneadm` provides.  The states are linear,
+      in that a zone must be `configured` then `installed`, and
+      only then can be `running`.  Note also that `halt` is currently
       used to stop zones."
 
     @states = {}
@@ -313,31 +313,31 @@ Puppet::Type.newtype(:zone) do
   # only used to boot the zone the very first time.
   newparam(:sysidcfg) do
     desc %{The text to go into the sysidcfg file when the zone is first
-      booted.  The best way is to use a template::
-
-        # $templatedir/sysidcfg
-        system_locale=en_US
-        timezone=GMT
-        terminal=xterms
-        security_policy=NONE
-        root_password=<%= password %>
-        timeserver=localhost
-        name_service=DNS {domain_name=<%= domain %> name_server=<%= nameserver %>}
-        network_interface=primary {hostname=<%= realhostname %>
-          ip_address=<%= ip %>
-          netmask=<%= netmask %>
-          protocol_ipv6=no
-          default_route=<%= defaultroute %>}
-        nfs4_domain=dynamic
-
-      And then call that::
-
-        zone { myzone:
-          ip => "bge0:192.168.0.23",
-          sysidcfg => template(sysidcfg),
-          path => "/opt/zones/myzone",
-          realhostname => "fully.qualified.domain.name"
-        }
+      booted.  The best way is to use a template:
+
+          # $templatedir/sysidcfg
+          system_locale=en_US
+          timezone=GMT
+          terminal=xterms
+          security_policy=NONE
+          root_password=<%= password %>
+          timeserver=localhost
+          name_service=DNS {domain_name=<%= domain %> name_server=<%= nameserver %>}
+          network_interface=primary {hostname=<%= realhostname %>
+            ip_address=<%= ip %>
+            netmask=<%= netmask %>
+            protocol_ipv6=no
+            default_route=<%= defaultroute %>}
+          nfs4_domain=dynamic
+
+      And then call that:
+
+          zone { myzone:
+            ip => "bge0:192.168.0.23",
+            sysidcfg => template(sysidcfg),
+            path => "/opt/zones/myzone",
+            realhostname => "fully.qualified.domain.name"
+          }
 
       The sysidcfg only matters on the first booting of the zone,
       so Puppet only checks for it at that time.}

data/lib/puppet/type/zpool.rb

@@ -44,8 +44,11 @@ module Puppet
     end
 
     newproperty(:mirror, :array_matching => :all, :parent => Puppet::Property::MultiVDev) do
-      desc "List of all the devices to mirror for this pool. Each mirror should be a space separated string.
-        mirror => [\"disk1 disk2\", \"disk3 disk4\"]"
+      desc "List of all the devices to mirror for this pool. Each mirror should be a space separated string:
+
+    mirror => [\"disk1 disk2\", \"disk3 disk4\"]
+
+      "
 
       validate do |value|
         raise ArgumentError, "mirror names must be provided as string separated, not a comma-separated list" if value.include?(",")
@@ -53,8 +56,11 @@ module Puppet
     end
 
     newproperty(:raidz, :array_matching => :all, :parent => Puppet::Property::MultiVDev) do
-      desc "List of all the devices to raid for this pool. Should be an array of space separated strings.
-        raidz => [\"disk1 disk2\", \"disk3 disk4\"]"
+      desc "List of all the devices to raid for this pool. Should be an array of space separated strings:
+      
+          raidz => [\"disk1 disk2\", \"disk3 disk4\"]
+
+      "
 
       validate do |value|
         raise ArgumentError, "raid names must be provided as string separated, not a comma-separated list" if value.include?(",")
@@ -84,4 +90,3 @@ module Puppet
     end
   end
 end
-