puppet 0.25.5 → 2.6.0

data/lib/puppet/type/selboolean.rb

@@ -3,29 +3,29 @@
 #
 
 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/."
+  newtype(:selboolean) do
+    @doc = "Manages SELinux booleans on systems with SELinux support.  The supported booleans
+      are any of the ones found in /selinux/booleans/."
 
-        newparam(:name) do
-            desc "The name of the SELinux boolean to be managed."
-            isnamevar
-        end
-
-        newproperty(:value) do
-            desc "Whether the the SELinux boolean should be enabled or disabled."
-            newvalue(:on)
-            newvalue(:off)
-        end
+    newparam(:name) do
+      desc "The name of the SELinux boolean to be managed."
+      isnamevar
+    end
 
-        newparam(:persistent) do
-            desc "If set true, SELinux booleans will be written to disk and persist accross reboots.
-                The default is ``false``."
+    newproperty(:value) do
+      desc "Whether the the SELinux boolean should be enabled or disabled."
+      newvalue(:on)
+      newvalue(:off)
+    end
 
-            defaultto :false
-            newvalues(:true, :false)
-        end
+    newparam(:persistent) do
+      desc "If set true, SELinux booleans will be written to disk and persist accross reboots.
+        The default is ``false``."
 
+      defaultto :false
+      newvalues(:true, :false)
     end
+
+  end
 end
 

data/lib/puppet/type/selmodule.rb

@@ -3,52 +3,52 @@
 #
 
 Puppet::Type.newtype(:selmodule) do
-    @doc = "Manages loading and unloading of SELinux policy modules
-        on the system.  Requires SELinux support.  See man semodule(8)
-        for more information on SELinux policy modules."
+  @doc = "Manages loading and unloading of SELinux policy modules
+    on the system.  Requires SELinux support.  See man semodule(8)
+    for more information on SELinux policy modules."
 
-    ensurable
+  ensurable
 
-    newparam(:name) do
-        desc "The name of the SELinux policy to be managed.  You should not
-            include the customary trailing .pp extension."
-        isnamevar
-    end
+  newparam(:name) do
+    desc "The name of the SELinux policy to be managed.  You should not
+      include the customary trailing .pp extension."
+    isnamevar
+  end
 
-    newparam(:selmoduledir) 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
-            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."
+    desc "The directory to look for the compiled pp module file in.
+      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."
 
-        defaultto "/usr/share/selinux/targeted"
-    end
+    defaultto "/usr/share/selinux/targeted"
+  end
 
-    newparam(:selmodulepath) do
+  newparam(:selmodulepath) do
 
-        desc "The full path to the compiled .pp policy module.  You only need to use
-            this if the module file is not in the directory pointed at by selmoduledir."
+    desc "The full path to the compiled .pp policy module.  You only need to use
+      this if the module file is not in the directory pointed at by selmoduledir."
 
-    end
+  end
 
-    newproperty(:syncversion) do
+  newproperty(:syncversion) do
 
-        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
-        that will be made is if the policy is loaded at all or not."
+    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
+    that will be made is if the policy is loaded at all or not."
 
-        newvalue(:true)
-        newvalue(:false)
-    end
+    newvalue(:true)
+    newvalue(:false)
+  end
 
-    autorequire(:file) do
-        if self[:selmodulepath]
-            [self[:selmodulepath]]
-        else
-            ["#{self[:selmoduledir]}/#{self[:name]}.pp"]
-        end
+  autorequire(:file) do
+    if self[:selmodulepath]
+      [self[:selmodulepath]]
+    else
+      ["#{self[:selmoduledir]}/#{self[:name]}.pp"]
     end
+  end
 end
 

data/lib/puppet/type/service.rb

@@ -6,180 +6,180 @@
 
 module Puppet
 
-    newtype(:service) do
-        @doc = "Manage running services.  Service support unfortunately varies
-            widely by platform -- some platforms have very little if any
-            concept of a running service, and some have a very codified and
-            powerful concept.  Puppet's service support will generally be able
-            to make up for any inherent shortcomings (e.g., if there is no
-            '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.
-
-            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."
-
-        feature :refreshable, "The provider can restart the service.",
-            :methods => [:restart]
-
-        feature :enableable, "The provider can enable and disable the service",
-            :methods => [:disable, :enable, :enabled?]
-
-        feature :controllable, "The provider uses a control variable."
-
-        newproperty(:enable, :required_features => :enableable) do
-            desc "Whether a service should be enabled to start at boot.
-                This property behaves quite differently depending on the platform;
-                wherever possible, it relies on local tools to enable or disable
-                a given service."
-
-            newvalue(:true, :event => :service_enabled) do
-                provider.enable
-            end
-
-            newvalue(:false, :event => :service_disabled) do
-                provider.disable
-            end
-
-            def retrieve
-                return provider.enabled?
-            end
-        end
-
-        # Handle whether the service should actually be running right now.
-        newproperty(:ensure) do
-            desc "Whether a service should be running."
+  newtype(:service) do
+    @doc = "Manage running services.  Service support unfortunately varies
+      widely by platform -- some platforms have very little if any
+      concept of a running service, and some have a very codified and
+      powerful concept.  Puppet's service support will generally be able
+      to make up for any inherent shortcomings (e.g., if there is no
+      '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.
+
+      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."
+
+    feature :refreshable, "The provider can restart the service.",
+      :methods => [:restart]
+
+    feature :enableable, "The provider can enable and disable the service",
+      :methods => [:disable, :enable, :enabled?]
+
+    feature :controllable, "The provider uses a control variable."
+
+    newproperty(:enable, :required_features => :enableable) do
+      desc "Whether a service should be enabled to start at boot.
+        This property behaves quite differently depending on the platform;
+        wherever possible, it relies on local tools to enable or disable
+        a given service."
+
+      newvalue(:true, :event => :service_enabled) do
+        provider.enable
+      end
+
+      newvalue(:false, :event => :service_disabled) do
+        provider.disable
+      end
+
+      def retrieve
+        provider.enabled?
+      end
+    end
 
-            newvalue(:stopped, :event => :service_stopped) do
-                provider.stop
-            end
+    # Handle whether the service should actually be running right now.
+    newproperty(:ensure) do
+      desc "Whether a service should be running."
 
-            newvalue(:running, :event => :service_started) do
-                provider.start
-            end
+      newvalue(:stopped, :event => :service_stopped) do
+        provider.stop
+      end
 
-            aliasvalue(:false, :stopped)
-            aliasvalue(:true, :running)
+      newvalue(:running, :event => :service_started) do
+        provider.start
+      end
 
-            def retrieve
-                return provider.status
-            end
+      aliasvalue(:false, :stopped)
+      aliasvalue(:true, :running)
 
-            def sync
-                event = super()
+      def retrieve
+        provider.status
+      end
 
-                if property = @resource.property(:enable)
-                    val = property.retrieve
-                    property.sync unless property.insync?(val)
-                end
+      def sync
+        event = super()
 
-                return event
-            end
+        if property = @resource.property(:enable)
+          val = property.retrieve
+          property.sync unless property.insync?(val)
         end
 
-        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
-                provided."
-        end
+        event
+      end
+    end
 
-        newparam(:hasstatus) do
-            desc "Declare the the service's init script has a
-                functional status command.  Based on testing, it was found
-                that a large number of init scripts on different platforms do
-                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).
+    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
+        provided."
+    end
 
-                If you do not specify anything, then the service name will be
-                looked for in the process table."
+    newparam(:hasstatus) do
+      desc "Declare the the service's init script has a
+        functional status command.  Based on testing, it was found
+        that a large number of init scripts on different platforms do
+        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).
 
-            newvalues(:true, :false)
-        end
-        newparam(:name) do
-            desc "The name of the service to run.  This name is used to find
-                the service in whatever service subsystem it is in."
-            isnamevar
-        end
+        If you do not specify anything, then the service name will be
+        looked for in the process table."
 
-        newparam(:path) do
-            desc "The search path for finding init scripts.  Multiple values should
-                be separated by colons or provided as an array."
+      newvalues(:true, :false)
+    end
+    newparam(:name) do
+      desc "The name of the service to run.  This name is used to find
+        the service in whatever service subsystem it is in."
+      isnamevar
+    end
 
-            munge do |value|
-                value = [value] unless value.is_a?(Array)
-                # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com]
-                # It affects stand-alone blocks, too.
-                paths = value.flatten.collect { |p| x = p.split(":") }.flatten
-            end
+    newparam(:path) do
+      desc "The search path for finding init scripts.  Multiple values should
+        be separated by colons or provided as an array."
 
-            defaultto { provider.class.defpath if provider.class.respond_to?(:defpath) }
-        end
-        newparam(:pattern) do
-            desc "The pattern to search for in the process table.
-                This is used for stopping services on platforms that do not
-                support init scripts, and is also used for determining service
-                status on those service whose init scripts do not include a status
-                command.
+      munge do |value|
+        value = [value] unless value.is_a?(Array)
+        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com]
+        # It affects stand-alone blocks, too.
+        paths = value.flatten.collect { |p| x = p.split(":") }.flatten
+      end
 
-                If this is left unspecified and is needed to check the status
-                of a service, then the service name will be used instead.
+      defaultto { provider.class.defpath if provider.class.respond_to?(:defpath) }
+    end
+    newparam(:pattern) do
+      desc "The pattern to search for in the process table.
+        This is used for stopping services on platforms that do not
+        support init scripts, and is also used for determining service
+        status on those service whose init scripts do not include a status
+        command.
 
-                The pattern can be a simple string or any legal Ruby pattern."
+        If this is left unspecified and is needed to check the status
+        of a service, then the service name will be used instead.
 
-            defaultto { @resource[:binary] || @resource[:name] }
-        end
-        newparam(:restart) do
-            desc "Specify a *restart* command manually.  If left
-                unspecified, the service will be stopped and then started."
-        end
-        newparam(:start) do
-            desc "Specify a *start* command manually.  Most service subsystems
-                support a ``start`` command, so this will not need to be
-                specified."
-        end
-        newparam(:status) do
-            desc "Specify a *status* command manually.  If left
-                unspecified, the status method will be determined
-                automatically, usually by looking for the service in the
-                process table."
-        end
+        The pattern can be a simple string or any legal Ruby pattern."
 
-        newparam(:stop) do
-            desc "Specify a *stop* command manually."
-        end
+      defaultto { @resource[:binary] || @resource[:name] }
+    end
+    newparam(:restart) do
+      desc "Specify a *restart* command manually.  If left
+        unspecified, the service will be stopped and then started."
+    end
+    newparam(:start) do
+      desc "Specify a *start* command manually.  Most service subsystems
+        support a ``start`` command, so this will not need to be
+        specified."
+    end
+    newparam(:status) do
+      desc "Specify a *status* command manually.  If left
+        unspecified, the status method will be determined
+        automatically, usually by looking for the service in the
+        process table."
+    end
 
-        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."
-            defaultto { resource.name.gsub(".","_").upcase + "_START" if resource.provider.controllable? }
-        end
+    newparam(:stop) do
+      desc "Specify a *stop* command manually."
+    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."
-            newvalues(:true, :false)
-        end
+    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."
+      defaultto { resource.name.gsub(".","_").upcase + "_START" if resource.provider.controllable? }
+    end
 
-        newparam(:manifest) do
-            desc "Specify a command to config a service, or a path to a manifest to do so."
-        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."
+      newvalues(:true, :false)
+    end
 
-        # Basically just a synonym for restarting.  Used to respond
-        # to events.
-        def refresh
-            # Only restart if we're actually running
-            if (@parameters[:ensure] || newattr(:ensure)).retrieve == :running
-                provider.restart
-            else
-                debug "Skipping restart; service is not running"
-            end
-        end
+    newparam(:manifest) do
+      desc "Specify a command to config a service, or a path to a manifest to do so."
+    end
+
+    # Basically just a synonym for restarting.  Used to respond
+    # to events.
+    def refresh
+      # Only restart if we're actually running
+      if (@parameters[:ensure] || newattr(:ensure)).retrieve == :running
+        provider.restart
+      else
+        debug "Skipping restart; service is not running"
+      end
     end
+  end
 end