puppet 0.23.0 → 0.23.1

data/lib/puppet/type/maillist.rb

@@ -0,0 +1,57 @@
+module Puppet
+    newtype(:maillist) do
+        @doc = "Manage email lists.  This resource type currently can only create
+            and remove lists, it cannot reconfigure them."
+        
+        ensurable do
+            defaultvalues
+
+            newvalue(:purged) do
+                provider.purge
+            end
+        end
+
+        newparam(:name, :namevar => true) do
+            desc "The name of the email list."
+        end
+
+        newparam(:description) do
+            desc "The description of the mailing list."
+        end
+
+        newparam(:password) do
+            desc "The admin password."
+        end
+
+        newparam(:webserver) do
+            desc "The name of the host providing web archives and the administrative interface."
+        end
+
+        newparam(:mailserver) do
+            desc "The name of the host handling email for the list."
+        end
+
+        newparam(:admin) do
+            desc "The email address of the administrator."
+        end
+
+        def generate
+            if provider.respond_to?(:aliases)
+                should = self.should(:ensure) || :present
+                if should == :purged
+                    should = :absent
+                end
+                atype = Puppet::Type.type(:mailalias)
+                return provider.aliases.collect do |name, recipient|
+                    if atype[name]
+                        nil
+                    else
+                        malias = Puppet::Type.type(:mailalias).create(:name => name, :recipient => recipient, :ensure => should)
+                    end
+                end.compact
+            end
+        end
+    end
+end
+
+# $Id: maillist.rb 2677 2007-07-11 18:35:51Z luke $

data/lib/puppet/type/mount.rb

@@ -6,18 +6,20 @@ module Puppet
             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."
+            it will try to remount the filesystems if ``ensure`` is set to ``mounted``."
+
+        feature :refreshable, "The provider can remount the filesystem.",
+            :methods => [:remount]
         
         # Use the normal parent class, because we actually want to
         # call code when sync() is called.
         newproperty(:ensure) do
-            desc "Control what to do with this mount. If the value is 
-                  ``present``, the mount is entered into the mount table, 
-                  but not mounted, if it is ``absent``, the entry is removed 
-                  from the mount table and the filesystem is unmounted if 
-                  currently mounted, if it is ``mounted``, the filesystem 
-                  is entered into the mount table and mounted."
+            desc "Control what to do with this mount. Set this attribute to
+                ``present`` to make sure the filesystem is in the filesystem table
+                but not mounted (if the filesystem is currently mounted, it will be
+                unmounted).  Set it to ``absent`` to unmount (if necessary) and remove
+                the filesystem from the fstab.  Set to ``mounted`` to add it to the
+                fstab and mount it."
 
             newvalue(:present) do
                 if provider.mounted?
@@ -47,11 +49,23 @@ module Puppet
                 end
 
                 syncothers()
-                provider.mount
+                # The fs can be already mounted if it was absent but mounted
+                unless provider.mounted?
+                    provider.mount
+                end
             end
 
             def retrieve
-                return provider.mounted? ? :mounted : super()
+                # We need to special case :mounted; if we're absent, we still
+                # want 
+                curval = super()
+                if curval == :absent
+                    return curval
+                elsif provider.mounted?
+                    return :mounted
+                else
+                    return curval
+                end
             end
 
             def syncothers
@@ -199,4 +213,4 @@ module Puppet
     end
 end
 
-# $Id: mount.rb 2563 2007-06-11 22:30:00Z luke $
+# $Id: mount.rb 2723 2007-07-20 16:46:54Z luke $

data/lib/puppet/type/package.rb

@@ -3,8 +3,6 @@
 # This allows packages to exist on the same machine using different packaging
 # systems.
 
-require 'puppet/type/property'
-
 module Puppet
     class PackageError < Puppet::Error; end
     newtype(:package) do
@@ -59,27 +57,14 @@ module Puppet
                 provider.uninstall
             end
             
-            newvalue(:purged, :event => :package_purged) do
-                unless provider.purgeable?
-                    self.fail(
-                        "Package provider %s does not purging" %
-                        @resource[:provider]
-                    )
-                end
+            newvalue(:purged, :event => :package_purged, :required_features => :purgeable) do
                 provider.purge
             end
 
             # Alias the 'present' value.
             aliasvalue(:installed, :present)
 
-            newvalue(:latest) do
-                unless provider.upgradeable?
-                    self.fail(
-                        "Package provider %s does not support specifying 'latest'" %
-                        @resource[:provider]
-                    )
-                end
-
+            newvalue(:latest, :required_features => :upgradeable) do
                 # Because yum always exits with a 0 exit code, there's a retrieve
                 # in the "install" method.  So, check the current state now,
                 # to compare against later.
@@ -97,13 +82,7 @@ module Puppet
                 end
             end
 
-            newvalue(/./) do
-                unless provider.class.versionable?
-                    self.fail(
-                        "Package provider %s does not support specifying versions" %
-                        @resource[:provider]
-                     )
-                end
+            newvalue(/./, :required_features => :versionable) do
                 begin
                     provider.install
                 rescue => detail
@@ -132,7 +111,7 @@ module Puppet
                 @should.each { |should|
                     case should
                     when :present
-                        unless is == :absent
+                        unless [:absent, :purged].include?(is)
                             return true
                         end
                     when :latest
@@ -187,7 +166,7 @@ module Puppet
 
             # This retrieves the current state. LAK: I think this method is unused.
             def retrieve
-                return @resource.retrieve
+                return provider.properties[:ensure]
             end
 
             # Provide a bit more information when logging upgrades.
@@ -424,4 +403,4 @@ module Puppet
     end # Puppet.type(:package)
 end
 
-# $Id: package.rb 2620 2007-06-18 21:55:05Z luke $
+# $Id: package.rb 2709 2007-07-19 00:14:15Z luke $

data/lib/puppet/type/pfile.rb

@@ -3,7 +3,6 @@ require 'cgi'
 require 'etc'
 require 'uri'
 require 'fileutils'
-require 'puppet/type/property'
 require 'puppet/network/handler'
 
 module Puppet
@@ -12,13 +11,13 @@ module Puppet
         @doc = "Manages local files, including setting ownership and
             permissions, creation of both files and directories, and
             retrieving entire files from remote servers.  As Puppet matures, it
-            expected that the ``file`` element will be used less and less to
-            manage content, and instead native elements will be used to do so.
+            expected that the ``file`` resource will be used less and less to
+            manage content, and instead native resources will be used to do so.
             
             If you find that you are often copying files in from a central
-            location, rather than using native elements, please contact
+            location, rather than using native resources, please contact
             Reductive Labs and we can hopefully work with you to develop a
-            native element to support what you are doing."
+            native resource to support what you are doing."
 
         newparam(:path) do
             desc "The path to the file to manage.  Must be fully qualified."
@@ -1179,4 +1178,4 @@ module Puppet
     require 'puppet/type/pfile/mode'
     require 'puppet/type/pfile/type'
 end
-# $Id: pfile.rb 2610 2007-06-18 19:29:56Z lutter $
+# $Id: pfile.rb 2665 2007-07-09 21:32:33Z luke $

data/lib/puppet/type/pfile/source.rb

@@ -23,6 +23,11 @@ module Puppet
                     }
                 }
 
+            You can also leave out the server name, in which case ``puppetd``
+            will fill in the name of its configuration server and ``puppet``
+            will use the local filesystem.  This makes it easy to use the same
+            configuration in both local and centralized forms.
+
             Currently, only the ``puppet`` scheme is supported for source 
             URL's. Puppet will connect to the file server running on 
             ``server`` to retrieve the contents of the file. If the 
@@ -50,7 +55,8 @@ module Puppet
             This will use the first found file as the source.
             
             You cannot currently copy links using this mechanism; set ``links``
-            to ``follow`` if any remote sources are links."
+            to ``follow`` if any remote sources are links.
+            "
 
         uncheckable
         
@@ -271,4 +277,4 @@ module Puppet
     end
 end
 
-# $Id: source.rb 2610 2007-06-18 19:29:56Z lutter $
+# $Id: source.rb 2699 2007-07-14 23:04:19Z luke $

data/lib/puppet/type/pfilebucket.rb

@@ -65,9 +65,10 @@ module Puppet
         
         # Create a default filebucket.
         def self.mkdefaultbucket
-            unless self["puppet"]
-                self.create :name => "puppet", :path => Puppet[:clientbucketdir]
+            unless default = self["puppet"]
+                default = self.create :name => "puppet", :path => Puppet[:clientbucketdir]
             end
+            default
         end
 
         def self.instances
@@ -114,4 +115,4 @@ module Puppet
     end
 end
 
-# $Id: pfilebucket.rb 2551 2007-06-04 20:37:14Z luke $
+# $Id: pfilebucket.rb 2679 2007-07-11 20:23:49Z luke $

data/lib/puppet/type/resources.rb

@@ -137,8 +137,6 @@ Puppet::Type.newtype(:resources) do
             return false
         end
 
-        resource.info current_values.inspect
-        
         if current_values[resource.property(:uid)] <= self[:unless_system_user]
             return false
         else
@@ -151,4 +149,4 @@ Puppet::Type.newtype(:resources) do
     end
 end
 
-# $Id: resources.rb 2551 2007-06-04 20:37:14Z luke $
+# $Id: resources.rb 2687 2007-07-12 19:51:57Z luke $

data/lib/puppet/type/schedule.rb

@@ -2,20 +2,20 @@ module Puppet
     newtype(:schedule) do
         @doc = "Defined schedules for Puppet.  The important thing to understand
             about how schedules are currently implemented in Puppet is that they
-            can only be used to stop an element from being applied, they never
+            can only be used to stop a resource from being applied, they never
             guarantee that it is applied.
             
             Every time Puppet applies its configuration, it will collect the
-            list of elements whose schedule does not eliminate them from
+            list of resources whose schedule does not eliminate them from
             running right then, but there is currently no system in place to
-            guarantee that a given element runs at a given time.  If you
+            guarantee that a given resource runs at a given time.  If you
             specify a very  restrictive schedule and Puppet happens to run at a
-            time within that schedule, then the elements will get applied;
+            time within that schedule, then the resources will get applied;
             otherwise, that work may never get done.
             
             Thus, it behooves you to use wider scheduling (e.g., over a couple of
             hours) combined with periods and repetitions.  For instance, if you
-            wanted to restrict certain elements to only running once, between
+            wanted to restrict certain resources to only running once, between
             the hours of two and 4 AM, then you would use this schedule::
                 
                 schedule { maint:
@@ -25,7 +25,7 @@ module Puppet
                 }
 
             With this schedule, the first time that Puppet runs between 2 and 4 AM,
-            all elements with this schedule will get applied, but they won't
+            all resources with this schedule will get applied, but they won't
             get applied again between 2 and 4 because they will have already
             run once that day, and they won't get applied outside that schedule
             because they will be outside the scheduled range.
@@ -40,7 +40,7 @@ module Puppet
                     repeat => 2
                 }
 
-            This will cause elements to be applied every 30 minutes by default.
+            This will cause resources to be applied every 30 minutes by default.
             "
 
         newparam(:name) do
@@ -61,7 +61,7 @@ module Puppet
         end
 
         newparam(:range) do
-            desc "The earliest and latest that an element can be applied.  This
+            desc "The earliest and latest that a resource can be applied.  This
                 is always a range within a 24 hour period, and hours must be
                 specified in numbers between 0 and 23, inclusive.  Minutes and
                 seconds can be provided, using the normal colon as a separator.
@@ -71,7 +71,7 @@ module Puppet
                         range => \"1:30 - 4:30\"
                     }
                 
-                This is mostly useful for restricting certain elements to being
+                This is mostly useful for restricting certain resources to being
                 applied in maintenance windows or during off-peak hours."
 
             # This is lame; properties all use arrays as values, but parameters don't.
@@ -197,19 +197,19 @@ module Puppet
         end
 
         newparam(:period) do
-            desc "The period of repetition for an element.  Choose from among
+            desc "The period of repetition for a resource.  Choose from among
                 a fixed list of *hourly*, *daily*, *weekly*, and *monthly*.
-                The default is for an element to get applied every time that
+                The default is for a resource to get applied every time that
                 Puppet runs, whatever that period is.
 
-                Note that the period defines how often a given element will get
+                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 element can be applied (e.g., only at night during
+                that a given resource can be applied (e.g., only at night during
                 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 elements evenly in the period the
+                schedule the affected resources evenly in the period the
                 specified number of times.  Take this schedule::
 
                     schedule { veryoften:
@@ -217,7 +217,7 @@ module Puppet
                         repeat => 6
                     }
 
-                This can cause Puppet to apply that element up to every 10 minutes.
+                This can cause Puppet to apply that resource up to every 10 minutes.
 
                 At the moment, Puppet cannot guarantee that level of
                 repetition; that is, it can run up to every 10 minutes, but
@@ -358,4 +358,4 @@ module Puppet
     end
 end
 
-# $Id: schedule.rb 2551 2007-06-04 20:37:14Z luke $
+# $Id: schedule.rb 2665 2007-07-09 21:32:33Z luke $

data/lib/puppet/type/service.rb

@@ -22,6 +22,9 @@ module Puppet
             service depends on the platform. You can provide a special command
             for restarting with the ``restart`` attribute."
         
+        feature :refreshable, "The provider can restart the service.",
+            :methods => [:restart]
+        
         feature :enableable, "The provider can enable and disable the service",
             :methods => [:disable, :enable, :enabled?]
 
@@ -313,4 +316,4 @@ module Puppet
     end
 end
 
-# $Id: service.rb 2555 2007-06-08 17:20:00Z luke $
+# $Id: service.rb 2696 2007-07-14 20:26:31Z luke $

data/lib/puppet/type/tidy.rb

@@ -1,6 +1,5 @@
 
 require 'etc'
-require 'puppet/type/property'
 require 'puppet/type/pfile'
 
 module Puppet
@@ -293,4 +292,4 @@ module Puppet
     end
 end
 
-# $Id: tidy.rb 2551 2007-06-04 20:37:14Z luke $
+# $Id: tidy.rb 2647 2007-07-04 22:25:23Z luke $

data/lib/puppet/type/user.rb

@@ -1,6 +1,5 @@
 require 'etc'
 require 'facter'
-require 'puppet/type/property'
 
 module Puppet
     newtype(:user) do
@@ -8,7 +7,7 @@ module Puppet
             users, so it is lacking some features useful for managing normal
             users.
             
-            This element type uses the prescribed native tools for creating
+            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."
 
@@ -344,4 +343,4 @@ module Puppet
     end
 end
 
-# $Id: user.rb 2571 2007-06-13 20:01:34Z ajax $
+# $Id: user.rb 2665 2007-07-09 21:32:33Z luke $

data/lib/puppet/type/yumrepo.rb

@@ -188,7 +188,7 @@ module Puppet
             super
         end
 
-        # Return the Puppet::Util::IniConfig::Section for this yumrepo element
+        # Return the Puppet::Util::IniConfig::Section for this yumrepo resource
         def section
             self.class.section(self[:name])
         end
@@ -217,7 +217,7 @@ module Puppet
             return changes
         end
 
-        # Store modifications to this yumrepo element back to disk
+        # Store modifications to this yumrepo resource back to disk
         def store
             self.class.store
         end