puppet 0.25.5 → 2.6.0

data/lib/puppet/type/mailalias.rb

@@ -1,49 +1,49 @@
 module Puppet
-    newtype(:mailalias) do
-        @doc = "Creates an email alias in the local alias database."
+  newtype(:mailalias) do
+    @doc = "Creates an email alias in the local alias database."
 
-        ensurable
+    ensurable
 
-        newparam(:name, :namevar => true) do
-            desc "The alias name."
+    newparam(:name, :namevar => true) do
+      desc "The alias name."
+    end
+
+    newproperty(:recipient, :array_matching => :all) do
+      desc "Where email should be sent.  Multiple values
+        should be specified as an array."
+
+      def is_to_s(value)
+        if value.include?(:absent)
+          super
+        else
+          value.join(",")
         end
+      end
 
-        newproperty(:recipient, :array_matching => :all) do
-            desc "Where email should be sent.  Multiple values
-                should be specified as an array."
-
-            def is_to_s(value)
-                if value.include?(:absent)
-                    super
-                else
-                    value.join(",")
-                end
-            end
-
-            def should
-                @should
-            end
-
-            def should_to_s(value)
-                if value.include?(:absent)
-                    super
-                else
-                    value.join(",")
-                end
-            end
+      def should
+        @should
+      end
+
+      def should_to_s(value)
+        if value.include?(:absent)
+          super
+        else
+          value.join(",")
         end
+      end
+    end
 
-        newproperty(:target) do
-            desc "The file in which to store the aliases.  Only used by
-                those providers that write to disk."
+    newproperty(:target) do
+      desc "The file in which to store the aliases.  Only used by
+        those providers that write to disk."
 
-            defaultto { if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
-                    @resource.class.defaultprovider.default_target
-                else
-                    nil
-                end
-            }
+      defaultto { if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
+          @resource.class.defaultprovider.default_target
+        else
+          nil
         end
+      }
     end
+  end
 end
 

data/lib/puppet/type/maillist.rb

@@ -1,63 +1,63 @@
 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
-
-            def change_to_s(current_value, newvalue)
-              return "Purged #{resource}" if newvalue == :purged
-              super
-            end
-
-            def insync?(is)
-                return true if is == :absent && should == :purged
-                super
-            end
-        end
+  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
+
+      def change_to_s(current_value, newvalue)
+        return "Purged #{resource}" if newvalue == :purged
+        super
+      end
+
+      def insync?(is)
+        return true if is == :absent && should == :purged
+        super
+      end
+    end
 
-        newparam(:name, :namevar => true) do
-            desc "The name of the email list."
-        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(:description) do
+      desc "The description of the mailing list."
+    end
 
-        newparam(:password) do
-            desc "The admin password."
-        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(: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(: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
+    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)
-
-                provider.aliases.
-                    reject  { |name,recipient| catalog.resource(:mailalias, name) }.
-                    collect { |name,recipient| atype.new(:name => name, :recipient => recipient, :ensure => should) }
-            end
+    def generate
+      if provider.respond_to?(:aliases)
+        should = self.should(:ensure) || :present
+        if should == :purged
+          should = :absent
         end
+        atype = Puppet::Type.type(:mailalias)
+
+        provider.aliases.
+          reject  { |name,recipient| catalog.resource(:mailalias, name) }.
+          collect { |name,recipient| atype.new(:name => name, :recipient => recipient, :ensure => should) }
+      end
     end
+  end
 end
 

data/lib/puppet/type/mcx.rb

@@ -19,7 +19,7 @@
 
 Puppet::Type.newtype(:mcx) do
 
-    @doc = "MCX object management using DirectoryService on OS X.
+  @doc = "MCX object management using DirectoryService on OS X.
 
 Original Author: Jeff McCune <mccune.jeff@gmail.com>
 
@@ -32,84 +32,84 @@ to manage users and groups on the local computer, record the resulting
 puppet manifest using the command 'ralsh mcx' then deploying this
 to other machines.
 "
-    feature :manages_content, \
-        "The provider can manage MCXSettings as a string.",
-        :methods => [:content, :content=]
+  feature :manages_content, \
+    "The provider can manage MCXSettings as a string.",
+    :methods => [:content, :content=]
 
-    ensurable do
-        desc "Create or remove the MCX setting."
+  ensurable do
+    desc "Create or remove the MCX setting."
 
-        newvalue(:present) do
-            provider.create
-        end
-
-        newvalue(:absent) do
-            provider.destroy
-        end
+    newvalue(:present) do
+      provider.create
+    end
 
+    newvalue(:absent) do
+      provider.destroy
     end
 
-    newparam(:name) do
-        desc "The name of the resource being managed.
-        The default naming convention follows Directory Service paths::
+  end
 
-          /Computers/localhost
-          /Groups/admin
-          /Users/localadmin
+  newparam(:name) do
+    desc "The name of the resource being managed.
+    The default naming convention follows Directory Service paths::
 
-        The ds_type and ds_name type parameters are not necessary if the
-        default naming convention is followed."
-        isnamevar
-    end
+      /Computers/localhost
+      /Groups/admin
+      /Users/localadmin
 
-    newparam(:ds_type) do
+    The ds_type and ds_name type parameters are not necessary if the
+    default naming convention is followed."
+    isnamevar
+  end
 
-        desc "The DirectoryService type this MCX setting attaches to."
+  newparam(:ds_type) do
 
-        newvalues(:user, :group, :computer, :computerlist)
+    desc "The DirectoryService type this MCX setting attaches to."
 
-    end
+    newvalues(:user, :group, :computer, :computerlist)
 
-    newparam(:ds_name) do
-        desc "The name to attach the MCX Setting to.
-        e.g. 'localhost' when ds_type => computer. This setting is not
-        required, as it may be parsed so long as the resource name is
-        parseable.  e.g. /Groups/admin where 'group' is the dstype."
-    end
+  end
 
-    newproperty(:content, :required_features => :manages_content) do
-        desc "The XML Plist.  The value of MCXSettings in DirectoryService.
-        This is the standard output from the system command:
-        dscl localhost -mcxexport /Local/Default/<ds_type>/<ds_name>
-        Note that ds_type is capitalized and plural in the dscl command."
-    end
+  newparam(:ds_name) do
+    desc "The name to attach the MCX Setting to.
+    e.g. 'localhost' when ds_type => computer. This setting is not
+    required, as it may be parsed so long as the resource name is
+    parseable.  e.g. /Groups/admin where 'group' is the dstype."
+  end
 
-    # JJM Yes, this is not DRY at all.  Because of the code blocks
-    # autorequire must be done this way.  I think.
-
-    def setup_autorequire(type)
-        # value returns a Symbol
-        name = value(:name)
-        ds_type = value(:ds_type)
-        ds_name = value(:ds_name)
-        if ds_type == type
-            rval = [ ds_name.to_s ]
-        else
-            rval = [ ]
-        end
-        rval
-    end
+  newproperty(:content, :required_features => :manages_content) do
+    desc "The XML Plist.  The value of MCXSettings in DirectoryService.
+    This is the standard output from the system command:
+    dscl localhost -mcxexport /Local/Default/<ds_type>/ds_name
+    Note that ds_type is capitalized and plural in the dscl command."
+  end
 
-    autorequire(:user) do
-        setup_autorequire(:user)
-    end
+  # JJM Yes, this is not DRY at all.  Because of the code blocks
+  # autorequire must be done this way.  I think.
 
-    autorequire(:group) do
-        setup_autorequire(:group)
+  def setup_autorequire(type)
+    # value returns a Symbol
+    name = value(:name)
+    ds_type = value(:ds_type)
+    ds_name = value(:ds_name)
+    if ds_type == type
+      rval = [ ds_name.to_s ]
+    else
+      rval = [ ]
     end
+    rval
+  end
 
-    autorequire(:computer) do
-        setup_autorequire(:computer)
-    end
+  autorequire(:user) do
+    setup_autorequire(:user)
+  end
+
+  autorequire(:group) do
+    setup_autorequire(:group)
+  end
+
+  autorequire(:computer) do
+    setup_autorequire(:computer)
+  end
 
 end

data/lib/puppet/type/mount.rb

@@ -1,219 +1,225 @@
 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`` 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. 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?
-                    syncothers()
-                    provider.unmount
-                    return :mount_unmounted
-                else
-                    provider.create
-                    return :mount_created
-                end
-            end
-            aliasvalue :unmounted, :present
-
-            newvalue(:absent, :event => :mount_deleted) do
-                if provider.mounted?
-                    provider.unmount
-                end
-
-                provider.destroy
-            end
-
-            newvalue(:mounted, :event => :mount_mounted) do
-                # Create the mount point if it does not already exist.
-                current_value = self.retrieve
-                provider.create if current_value.nil? or current_value == :absent
-
-                syncothers()
-
-                # The fs can be already mounted if it was absent but mounted
-                provider.mount unless provider.mounted?
-            end
-
-            def retrieve
-                # 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
-                # We have to flush any changes to disk.
-                currentvalues = @resource.retrieve
-
-                # Determine if there are any out-of-sync properties.
-                oos = @resource.send(:properties).find_all do |prop|
-                    unless currentvalues.include?(prop)
-                        raise Puppet::DevError, "Parent has property %s but it doesn't appear in the current values", [prop.name]
-                    end
-                    if prop.name == :ensure
-                        false
-                    else
-                        ! prop.insync?(currentvalues[prop])
-                    end
-                end.each { |prop| prop.sync }.length
-                if oos > 0
-                    @resource.flush
-                end
-            end
+  # 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`` 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. Set this attribute to
+        ``umounted`` 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. Set to ``present`` to add to fstab but not change
+        mount/unmount status"
+
+      newvalue(:defined) do
+        provider.create
+        return :mount_created
+      end
+
+      aliasvalue :present, :defined
+
+      newvalue(:unmounted) do
+        if provider.mounted?
+          syncothers
+          provider.unmount
+          return :mount_unmounted
+        else
+          provider.create
+          return :mount_created
         end
+      end
 
-        newproperty(:device) do
-            desc "The device providing the mount.  This can be whatever
-                device is supporting by the mount, including network
-                devices or devices specified by UUID rather than device
-                path, depending on the operating system."
-        end
+      newvalue(:absent, :event => :mount_deleted) do
+        provider.unmount if provider.mounted?
 
-        # Solaris specifies two devices, not just one.
-        newproperty(:blockdevice) do
-            desc "The device to fsck.  This is property is only valid
-                on Solaris, and in most cases will default to the correct
-                value."
-
-            # Default to the device but with "dsk" replaced with "rdsk".
-            defaultto do
-                if Facter["operatingsystem"].value == "Solaris"
-                    device = @resource.value(:device)
-                    if device =~ %r{/dsk/}
-                        device.sub(%r{/dsk/}, "/rdsk/")
-                    else
-                        nil
-                    end
-                else
-                    nil
-                end
-            end
-        end
+        provider.destroy
+      end
 
-        newproperty(:fstype) do
-            desc "The mount type.  Valid values depend on the
-                operating system."
-        end
+      newvalue(:mounted, :event => :mount_mounted) do
+        # Create the mount point if it does not already exist.
+        current_value = self.retrieve
+        provider.create if current_value.nil? or current_value == :absent
 
-        newproperty(:options) do
-            desc "Mount options for the mounts, as they would
-                appear in the fstab."
-        end
+        syncothers
 
-        newproperty(:pass) do
-            desc "The pass in which the mount is checked."
+        # The fs can be already mounted if it was absent but mounted
+        provider.mount unless provider.mounted?
+      end
 
-            defaultto {
-                if @resource.managed?
-                    0
-                end
-            }
+      def insync?(is)
+        if should == :defined and is != :absent
+          true
+        else
+          super
         end
-
-        newproperty(:atboot) do
-            desc "Whether to mount the mount at boot.  Not all platforms
-                support this."
+      end
+
+      def retrieve
+        # We need to special case :mounted; if we're absent, we still
+        # want
+        curval = super()
+        if curval == :absent
+          return :absent
+        elsif provider.mounted?
+          return :mounted
+        else
+          return :unmounted
         end
+      end
+
+      def syncothers
+        # We have to flush any changes to disk.
+        currentvalues = @resource.retrieve_resource
+
+        # Determine if there are any out-of-sync properties.
+        oos = @resource.send(:properties).find_all do |prop|
+          unless currentvalues.include?(prop)
+            raise Puppet::DevError, "Parent has property %s but it doesn't appear in the current values", [prop.name]
+          end
+          if prop.name == :ensure
+            false
+          else
+            ! prop.insync?(currentvalues[prop])
+          end
+        end.each { |prop| prop.sync }.length
+        @resource.flush if oos > 0
+      end
+    end
+
+    newproperty(:device) do
+      desc "The device providing the mount.  This can be whatever
+        device is supporting by the mount, including network
+        devices or devices specified by UUID rather than device
+        path, depending on the operating system."
+    end
 
-        newproperty(:dump) do
-            desc "Whether to dump the mount.  Not all platform support this. 
-                Valid values are ``1`` or ``0``. or ``2`` on FreeBSD, Default is ``0``." 
-            
-            if Facter["operatingsystem"].value == "FreeBSD" 
-                newvalue(%r{(0|1|2)})
-            else
-                newvalue(%r{(0|1)})
-            end
-
-            newvalue(%r{(0|1)})
-
-            defaultto {
-                if @resource.managed?
-                    0
-                end
-            }
+    # Solaris specifies two devices, not just one.
+    newproperty(:blockdevice) do
+      desc "The device to fsck.  This is property is only valid
+        on Solaris, and in most cases will default to the correct
+        value."
+
+      # Default to the device but with "dsk" replaced with "rdsk".
+      defaultto do
+        if Facter["operatingsystem"].value == "Solaris"
+          device = @resource.value(:device)
+          if device =~ %r{/dsk/}
+            device.sub(%r{/dsk/}, "/rdsk/")
+          else
+            nil
+          end
+        else
+          nil
         end
+      end
+    end
 
-        newproperty(:target) do
-            desc "The file in which to store the mount table.  Only used by
-                those providers that write to disk."
+    newproperty(:fstype) do
+      desc "The mount type.  Valid values depend on the
+        operating system.  This is a required option."
+    end
 
-            defaultto { if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
-                    @resource.class.defaultprovider.default_target
-                else
-                    nil
-                end
-            }
-        end
+    newproperty(:options) do
+      desc "Mount options for the mounts, as they would
+        appear in the fstab."
+    end
 
-        newparam(:name) do
-            desc "The mount path for the mount."
+    newproperty(:pass) do
+      desc "The pass in which the mount is checked."
 
-            isnamevar
-        end
+      defaultto {
+        0 if @resource.managed?
+      }
+    end
 
-        newparam(:path) do
-            desc "The deprecated name for the mount point.  Please use ``name`` now."
+    newproperty(:atboot) do
+      desc "Whether to mount the mount at boot.  Not all platforms
+        support this."
+    end
 
-            def value=(value)
-                warning "'path' is deprecated for mounts.  Please use 'name'."
-                @resource[:name] = value
-                super
-            end
-        end
+    newproperty(:dump) do
+      desc "Whether to dump the mount.  Not all platform support this.
+        Valid values are ``1`` or ``0``. or ``2`` on FreeBSD, Default is ``0``."
 
-        newparam(:remounts) do
-            desc "Whether the mount can be remounted  ``mount -o remount``.  If
-                this is false, then the filesystem will be unmounted and remounted
-                manually, which is prone to failure."
-
-            newvalues(:true, :false)
-            defaultto do
-                case Facter.value(:operatingsystem)
-                when "FreeBSD", "Darwin"
-                    false
-                else
-                    true
-                end
-            end
-        end
+      if Facter["operatingsystem"].value == "FreeBSD"
+        newvalue(%r{(0|1|2)})
+      else
+        newvalue(%r{(0|1)})
+      end
+
+      newvalue(%r{(0|1)})
+
+      defaultto {
+        0 if @resource.managed?
+      }
+    end
 
-        def refresh
-            # Only remount if we're supposed to be mounted.
-            provider.remount if self.should(:fstype) != "swap" and provider.mounted?
+    newproperty(:target) do
+      desc "The file in which to store the mount table.  Only used by
+        those providers that write to disk."
+
+      defaultto { if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
+          @resource.class.defaultprovider.default_target
+        else
+          nil
         end
+      }
+    end
+
+    newparam(:name) do
+      desc "The mount path for the mount."
+
+      isnamevar
+    end
+
+    newparam(:path) do
+      desc "The deprecated name for the mount point.  Please use ``name`` now."
+
+      def value=(value)
+        warning "'path' is deprecated for mounts.  Please use 'name'."
+        @resource[:name] = value
+        super
+      end
+    end
 
-        def value(name)
-            name = symbolize(name)
-            ret = nil
-            if property = @parameters[name]
-                return property.value
-            end
+    newparam(:remounts) do
+      desc "Whether the mount can be remounted  ``mount -o remount``.  If
+        this is false, then the filesystem will be unmounted and remounted
+        manually, which is prone to failure."
+
+      newvalues(:true, :false)
+      defaultto do
+        case Facter.value(:operatingsystem)
+        when "FreeBSD", "Darwin"
+          false
+        else
+          true
         end
+      end
+    end
+
+    def refresh
+      # Only remount if we're supposed to be mounted.
+      provider.remount if self.should(:fstype) != "swap" and provider.mounted?
+    end
+
+    def value(name)
+      name = symbolize(name)
+      ret = nil
+      if property = @parameters[name]
+        return property.value
+      end
     end
+  end
 end