puppet 0.24.9 → 0.25.0

data/lib/puppet/util/settings/boolean_setting.rb

@@ -0,0 +1,33 @@
+require 'puppet/util/settings/setting'
+
+# A simple boolean.
+class Puppet::Util::Settings::BooleanSetting < Puppet::Util::Settings::Setting
+    # get the arguments in getopt format
+    def getopt_args
+        if short
+            [["--#{name}", "-#{short}", GetoptLong::NO_ARGUMENT],
+             ["--no-#{name}", GetoptLong::NO_ARGUMENT]]
+        else
+            [["--#{name}", GetoptLong::NO_ARGUMENT],
+             ["--no-#{name}", GetoptLong::NO_ARGUMENT]]
+        end
+    end
+
+    def optparse_args
+        if short
+            ["--[no-]#{name}", "-#{short}", desc, :NONE ]
+        else
+            ["--[no-]#{name}", desc, :NONE]
+        end
+    end
+
+    def munge(value)
+        case value
+        when true, "true"; return true
+        when false, "false"; return false
+        else
+            raise ArgumentError, "Invalid value '%s' for %s" %
+                [value.inspect, @name]
+        end
+    end
+end

data/lib/puppet/util/settings/file_setting.rb

@@ -0,0 +1,119 @@
+require 'puppet/util/settings/setting'
+
+# A file.
+class Puppet::Util::Settings::FileSetting < Puppet::Util::Settings::Setting
+    AllowedOwners = %w{root service}
+    AllowedGroups = %w{service}
+
+    class SettingError < StandardError; end
+
+    attr_accessor :mode, :create
+
+    # Should we create files, rather than just directories?
+    def create_files?
+        create
+    end
+
+    def group=(value)
+        unless AllowedGroups.include?(value)
+            raise SettingError, "Invalid group %s on setting %s. Valid groups are %s." % [value, name, AllowedGroups.join(', ')]
+        end
+        @group = value
+    end
+
+    def group
+        return unless defined?(@group) && @group
+        @settings[:group]
+    end
+
+    def owner=(value)
+        unless AllowedOwners.include?(value)
+            raise SettingError, "Invalid owner %s on setting %s. Valid owners are %s." % [value, name, AllowedOwners.join(', ')]
+        end
+        @owner = value
+    end
+
+    def owner
+        return unless defined?(@owner) && @owner
+        return "root" if @owner == "root" or ! use_service_user?
+        @settings[:user]
+    end
+
+    def use_service_user?
+        @settings[:mkusers] or @settings.service_user_available?
+    end
+
+    # Set the type appropriately.  Yep, a hack.  This supports either naming
+    # the variable 'dir', or adding a slash at the end.
+    def munge(value)
+        # If it's not a fully qualified path...
+        if value.is_a?(String) and value !~ /^\$/ and value !~ /^\// and value != 'false'
+            # Make it one
+            value = File.join(Dir.getwd, value)
+        end
+        if value.to_s =~ /\/$/
+            @type = :directory
+            return value.sub(/\/$/, '')
+        end
+        return value
+    end
+
+    # Return the appropriate type.
+    def type
+        value = @settings.value(self.name)
+        if @name.to_s =~ /dir/
+            return :directory
+        elsif value.to_s =~ /\/$/
+            return :directory
+        elsif value.is_a? String
+            return :file
+        else
+            return nil
+        end
+    end
+
+    # Turn our setting thing into a Puppet::Resource instance.
+    def to_resource
+        return nil unless type = self.type
+
+        path = self.value
+
+        return nil unless path.is_a?(String)
+
+        # Make sure the paths are fully qualified.
+        path = File.join(Dir.getwd, path) unless path =~ /^\//
+
+        return nil unless type == :directory or create_files? or File.exist?(path)
+        return nil if path =~ /^\/dev/
+
+        resource = Puppet::Resource.new(:file, path)
+        resource[:mode] = self.mode if self.mode
+
+        if Puppet.features.root?
+            resource[:owner] = self.owner if self.owner
+            resource[:group] = self.group if self.group
+        end
+
+        resource[:ensure] = type
+        resource[:loglevel] = :debug
+        resource[:backup] = false
+
+        resource.tag(self.section, self.name, "settings")
+
+        resource
+    end
+
+    # Make sure any provided variables look up to something.
+    def validate(value)
+        return true unless value.is_a? String
+        value.scan(/\$(\w+)/) { |name|
+            name = $1
+            unless @settings.include?(name)
+                raise ArgumentError,
+                    "Settings parameter '%s' is undefined" %
+                    name
+            end
+        }
+    end
+end
+

data/lib/puppet/util/settings/setting.rb

@@ -0,0 +1,110 @@
+# The base element type.
+class Puppet::Util::Settings::Setting
+    attr_accessor :name, :section, :default, :setbycli, :call_on_define
+    attr_reader :desc, :short
+
+    def desc=(value)
+        @desc = value.gsub(/^\s*/, '')
+    end
+
+    # get the arguments in getopt format
+    def getopt_args
+        if short
+            [["--#{name}", "-#{short}", GetoptLong::REQUIRED_ARGUMENT]]
+        else
+            [["--#{name}", GetoptLong::REQUIRED_ARGUMENT]]
+        end
+    end
+
+    # get the arguments in OptionParser format
+    def optparse_args
+        if short
+            ["--#{name}", "-#{short}", desc, :REQUIRED]
+        else
+            ["--#{name}", desc, :REQUIRED]
+        end
+    end
+
+    def hook=(block)
+        meta_def :handle, &block
+    end
+
+    # Create the new element.  Pretty much just sets the name.
+    def initialize(args = {})
+        unless @settings = args.delete(:settings)
+            raise ArgumentError.new("You must refer to a settings object")
+        end
+
+        args.each do |param, value|
+            method = param.to_s + "="
+            unless self.respond_to? method
+                raise ArgumentError, "%s does not accept %s" % [self.class, param]
+            end
+
+            self.send(method, value)
+        end
+
+        unless self.desc
+            raise ArgumentError, "You must provide a description for the %s config option" % self.name
+        end
+    end
+
+    def iscreated
+        @iscreated = true
+    end
+
+    def iscreated?
+        if defined? @iscreated
+            return @iscreated
+        else
+            return false
+        end
+    end
+
+    def set?
+        if defined? @value and ! @value.nil?
+            return true
+        else
+            return false
+        end
+    end
+
+    # short name for the celement
+    def short=(value)
+        if value.to_s.length != 1
+            raise ArgumentError, "Short names can only be one character."
+        end
+        @short = value.to_s
+    end
+
+    # Convert the object to a config statement.
+    def to_config
+        str = @desc.gsub(/^/, "# ") + "\n"
+
+        # Add in a statement about the default.
+        if defined? @default and @default
+            str += "# The default value is '%s'.\n" % @default
+        end
+
+        # If the value has not been overridden, then print it out commented
+        # and unconverted, so it's clear that that's the default and how it
+        # works.
+        value = @settings.value(self.name)
+
+        if value != @default
+            line = "%s = %s" % [@name, value]
+        else
+            line = "# %s = %s" % [@name, @default]
+        end
+
+        str += line + "\n"
+
+        str.gsub(/^/, "    ")
+    end
+
+    # Retrieves the value, or if it's not set, retrieves the default.
+    def value
+        @settings.value(self.name)
+    end
+end
+

data/lib/puppet/util/subclass_loader.rb

@@ -31,7 +31,7 @@ module Puppet::Util::SubclassLoader
         # that we're defining a class method here, not an instance.
         meta_def(name) do |subname|
             subname = subname.to_s.downcase
-        
+
             unless c = @subclasses.find { |c| c.name.to_s.downcase == subname }
                 loader.load(subname)
                 c = @subclasses.find { |c| c.name.to_s.downcase == subname }

data/lib/puppet/util/suidmanager.rb

@@ -29,14 +29,14 @@ module Puppet::Util::SUIDManager
         begin
             self.egid = convert_xid :gid, new_gid if new_gid
             self.euid = convert_xid :uid, new_uid if new_uid
-  
+
             yield
         ensure
             self.euid, self.egid = old_euid, old_egid
         end
     end
     module_function :asuser
-    
+
     # Make sure the passed argument is a number.
     def convert_xid(type, id)
         map = {:gid => :group, :uid => :user}

data/lib/puppet/util/tagging.rb

@@ -16,7 +16,7 @@ module Puppet::Util::Tagging
             @tags << tag unless @tags.include?(tag)
         end
 
-        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com] 
+        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com]
         qualified.collect { |name| x = name.split("::") }.flatten.each { |tag| @tags << tag unless @tags.include?(tag) }
     end
 

data/lib/puppet/util/warnings.rb

@@ -2,20 +2,28 @@
 module Puppet::Util::Warnings
     module_function
 
+    def notice_once(msg)
+        Puppet::Util::Warnings.maybe_log(msg, self.class) { Puppet.notice msg }
+    end
+
+
     def warnonce(msg)
-        $stampwarnings ||= {}
-        $stampwarnings[self.class] ||= []
-        unless $stampwarnings[self.class].include? msg
-            Puppet.warning msg
-            $stampwarnings[self.class] << msg
-        end
+        Puppet::Util::Warnings.maybe_log(msg, self.class) { Puppet.warning msg }
+    end
 
+    def clear_warnings()
+        @stampwarnings = {}
         return nil
     end
 
-    def clear_warnings()
-        $stampwarnings = {}
+    protected
+
+    def self.maybe_log(message, klass)
+        @stampwarnings ||= {}
+        @stampwarnings[klass] ||= []
+        return nil if @stampwarnings[klass].include? message
+        yield
+        @stampwarnings[klass] << message
         return nil
     end
 end
-

data/man/man8/filebucket.8

@@ -1,6 +1,6 @@
 .TH   "" "" ""
 .SH NAME
- \- 
+ \-
 
 .\" Man page generated from reStructeredText.
 
@@ -113,4 +113,4 @@ License
 
 
 .\" Generated by docutils manpage writer on 2008-05-05 09:33.
-.\" 
+.\"

data/man/man8/pi.8

@@ -1,6 +1,6 @@
 .TH   "" "" ""
 .SH NAME
- \- 
+ \-
 
 .\" Man page generated from reStructeredText.
 
@@ -31,4 +31,4 @@ Include metaparams
 
 
 .\" Generated by docutils manpage writer on 2008-05-05 09:33.
-.\" 
+.\"

data/man/man8/puppet.8

@@ -1,6 +1,6 @@
 .TH   "" "" ""
 .SH NAME
- \- 
+ \-
 
 .\" Man page generated from reStructeredText.
 
@@ -67,12 +67,11 @@ puppet \-l /tmp/script.log script.pp
 
 .SH AUTHOR
 Luke Kanies
-
-
+.\" Generated by docutils manpage writer on 2008-01-20 10:28.
 .SH COPYRIGHT
 Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
 License
 
 
 .\" Generated by docutils manpage writer on 2008-05-05 09:33.
-.\" 
+.\"

data/man/man8/puppet.conf.8

@@ -1,37 +1,37 @@
 .TH Configuration Reference  "" "" ""
 .SH NAME
-Configuration Reference \- 
+Configuration Reference \-
 
 .\" Man page generated from reStructeredText.
-This page is autogenerated; any changes will get overwritten 
+This page is autogenerated; any changes will get overwritten
 .I (last generated on Mon May 05 09:33:01 +1000 2008)
 
 
 
 .\" topic: Contents
-.\" 
+.\"
 .\" Specifying Configuration Parameters
-.\" 
+.\"
 .\" Signals
-.\" 
+.\"
 .\" Configuration Parameter Reference
 
 .SH Specifying Configuration Parameters
 
 .SS On The Command\-Line
-Every Puppet executable (with the exception of 
+Every Puppet executable (with the exception of
 .\" visit_literal
 puppetdoc
 .\" depart_literal
 ) accepts all of
 the parameters below, but not all of the arguments make sense for every executable.
 Each parameter has a section listed with it in parentheses; often, that section
-will map to an executable (e.g., 
+will map to an executable (e.g.,
 .\" visit_literal
 puppetd
 .\" depart_literal
 ), in which case it probably only
-makes sense for that one executable.  If 
+makes sense for that one executable.  If
 .\" visit_literal
 main
 .\" depart_literal
@@ -43,7 +43,7 @@ arguments, so it should be obvious whether an argument is appropriate or not.
 
 These parameters can be supplied to the executables either as command\-line
 options or in the configuration file.  For instance, the command\-line
-invocation below would set the configuration directory to 
+invocation below would set the configuration directory to
 .\" visit_literal
 /private/puppet
 .\" depart_literal
@@ -69,17 +69,17 @@ the client configuration.
 .SS Configuration Files
 As mentioned above, the configuration parameters can also be stored in a
 configuration file, located in the configuration directory.  As root, the
-default configuration directory is 
+default configuration directory is
 .\" visit_literal
 /etc/puppet
 .\" depart_literal
 , and as a regular user, the
-default configuration directory is 
+default configuration directory is
 .\" visit_literal
 ~user/.puppet
 .\" depart_literal
 .  As of 0.23.0, all
-executables look for 
+executables look for
 .\" visit_literal
 puppet.conf
 .\" depart_literal
@@ -89,7 +89,7 @@ puppet.conf
 .\" visit_literal
 puppet.conf
 .\" depart_literal
- is located at 
+ is located at
 .\" visit_literal
 /etc/puppet/puppet.conf
 .\" depart_literal
@@ -100,27 +100,27 @@ puppet.conf
 .\" depart_literal
  as a regular user by default.
 
-All executables will set any parameters set within the 
+All executables will set any parameters set within the
 .\" visit_literal
 main
 .\" depart_literal
  section,
 while each executable will also look for a section named for the executable
-and load those parameters.  For example, 
+and load those parameters.  For example,
 .\" visit_literal
 puppetd
 .\" depart_literal
  will look for a
-section named 
+section named
 .\" visit_literal
 puppetd
 .\" depart_literal
-, and 
+, and
 .\" visit_literal
 puppetmasterd
 .\" depart_literal
  looks for a section
-named 
+named
 .\" visit_literal
 puppetmasterd
 .\" depart_literal
@@ -142,7 +142,7 @@ puppet.conf
     confdir = /private/puppet
     storeconfigs = true
 .fi
-Note that boolean parameters must be explicitly specified as 
+Note that boolean parameters must be explicitly specified as
 .I true
  or
 
@@ -159,7 +159,7 @@ so within curly braces on the same line:
 .fi
 If you\'re starting out with a fresh configuration, you may wish to let
 the executable generate a template configuration file for you by invoking
-the executable in question with the 
+the executable in question with the
 .I \-\-genconfig
  command.  The executable
 will print a template configuration to standard output, which can be
@@ -178,9 +178,9 @@ valuable information.
 All parameters will be under a single section heading matching the name of
 the process used to generate the configuraiton (\'puppetd\', in this case).
 
-Like the 
+Like the
 .I \-\-genconfig
- argument, the executables also accept a 
+ argument, the executables also accept a
 .I \-\-genmanifest
 
 argument, which will generate a manifest that can be used to manage all of
@@ -191,14 +191,14 @@ likewise be redirected to a file:
 .nf
 $ puppetd \-\-genmanifest > /etc/puppet/manifests/site.pp
 .fi
-Puppet can also create user and group accounts for itself (one 
+Puppet can also create user and group accounts for itself (one
 .I puppet
  group
-and one 
+and one
 .I puppet
- user) if it is invoked as 
+ user) if it is invoked as
 .I root
- with the 
+ with the
 .I \-\-mkusers
  argument:
 
@@ -208,11 +208,11 @@ $ puppetd \-\-mkusers
 .fi
 
 .SH Signals
-The 
+The
 .\" visit_literal
 puppetd
 .\" depart_literal
- and 
+ and
 .\" visit_literal
 puppetmasterd
 .\" depart_literal
@@ -226,32 +226,32 @@ tself.  Predictably, interrupt and terminate (
 .\" visit_literal
 SIGINT
 .\" depart_literal
- and 
+ and
 .\" visit_literal
 SIGHUP
 .\" depart_literal
 ) will shut
-down the server, whether it be an instance of 
+down the server, whether it be an instance of
 .\" visit_literal
 puppetd
 .\" depart_literal
- or 
+ or
 .\" visit_literal
 puppetmasterd
 .\" depart_literal
 .
 
-Sending the 
+Sending the
 .\" visit_literal
 SIGUSR1
 .\" depart_literal
- signal to an instance of 
+ signal to an instance of
 .\" visit_literal
 puppetd
 .\" depart_literal
  will cause it to
 immediately begin a new configuration transaction with the server.  This
-signal has no effect on 
+signal has no effect on
 .\" visit_literal
 puppetmasterd
 .\" depart_literal
@@ -264,11 +264,11 @@ Puppet executables, but the executables will ignore any inappropriate values.
 
 
 .SS authconfig
-The configuration file that defines the rights to the different namespaces and methods.  This can be used as a coarse\-grained authorization system for both 
+The configuration file that defines the rights to the different namespaces and methods.  This can be used as a coarse\-grained authorization system for both
 .\" visit_literal
 puppetd
 .\" depart_literal
- and 
+ and
 .\" visit_literal
 puppetmasterd
 .\" depart_literal
@@ -464,11 +464,11 @@ Default: absinthe.lovedthanlost.net
 
 
 .SS classfile
-The file in which puppetd stores a list of the classes associated with the retrieved configuration.  Can be loaded in the separate 
+The file in which puppetd stores a list of the classes associated with the retrieved configuration.  Can be loaded in the separate
 .\" visit_literal
 puppet
 .\" depart_literal
- executable using the 
+ executable using the
 .\" visit_literal
 \-\-loadclasses
 .\" depart_literal
@@ -490,7 +490,7 @@ Default: $vardir/clientbucket
 
 
 .SS code
-Code to parse directly.  This is essentially only used by 
+Code to parse directly.  This is essentially only used by
 .\" visit_literal
 puppet
 .\" depart_literal
@@ -498,19 +498,19 @@ puppet
 
 
 .SS color
-Whether to use colors when logging to the console. Valid values are 
+Whether to use colors when logging to the console. Valid values are
 .\" visit_literal
 ansi
 .\" depart_literal
- (equivalent to 
+ (equivalent to
 .\" visit_literal
 true
 .\" depart_literal
-), 
+),
 .\" visit_literal
 html
 .\" depart_literal
- (mostly used during testing with TextMate), and 
+ (mostly used during testing with TextMate), and
 .\" visit_literal
 false
 .\" depart_literal
@@ -523,11 +523,11 @@ Default: ansi
 
 
 .SS confdir
-The main Puppet configuration directory.  The default for this parameter is calculated based on the user.  If the process is runnig as root or the user that 
+The main Puppet configuration directory.  The default for this parameter is calculated based on the user.  If the process is runnig as root or the user that
 .\" visit_literal
 puppetmasterd
 .\" depart_literal
- is supposed to run as, it defaults to a system directory, but if it\'s running as any other user, it defaults to being in 
+ is supposed to run as, it defaults to a system directory, but if it\'s running as any other user, it defaults to being in
 .\" visit_literal
 ~
 .\" depart_literal
@@ -678,11 +678,11 @@ Default: memorysize,memoryfree,swapsize,swapfree
 
 
 .SS environment
-The environment Puppet is running in.  For clients (e.g., 
+The environment Puppet is running in.  For clients (e.g.,
 .\" visit_literal
 puppetd
 .\" depart_literal
-) this determines the environment itself, which is used to find modules and much more.  For servers (i.e., 
+) this determines the environment itself, which is used to find modules and much more.  For servers (i.e.,
 .\" visit_literal
 puppetmasterd
 .\" depart_literal
@@ -713,19 +713,19 @@ Default: false
 
 
 .SS external_nodes
-An external command that can produce node information.  The output must be a YAML dump of a hash, and that hash must have one or both of 
+An external command that can produce node information.  The output must be a YAML dump of a hash, and that hash must have one or both of
 .\" visit_literal
 classes
 .\" depart_literal
- and 
+ and
 .\" visit_literal
 parameters
 .\" depart_literal
-, where 
+, where
 .\" visit_literal
 classes
 .\" depart_literal
- is an array and 
+ is an array and
 .\" visit_literal
 parameters
 .\" depart_literal
@@ -765,7 +765,7 @@ Default: .svn CVS
 
 
 .SS factsource
-From where to retrieve facts.  The standard Puppet 
+From where to retrieve facts.  The standard Puppet
 .\" visit_literal
 file
 .\" depart_literal
@@ -1002,7 +1002,7 @@ The password to use to connect to LDAP.
 
 
 .SS ldapport
-The LDAP port.  Only used if 
+The LDAP port.  Only used if
 .\" visit_literal
 ldapnodes
 .\" depart_literal
@@ -1015,7 +1015,7 @@ Default: 389
 
 
 .SS ldapserver
-The LDAP server.  Only used if 
+The LDAP server.  Only used if
 .\" visit_literal
 ldapnodes
 .\" depart_literal
@@ -1077,11 +1077,11 @@ Default: $vardir/lib
 
 
 .SS listen
-Whether puppetd should listen for connections.  If this is true, then by default only the 
+Whether puppetd should listen for connections.  If this is true, then by default only the
 .\" visit_literal
 runner
 .\" depart_literal
- server is started, which allows remote authorized and authenticated nodes to connect and trigger 
+ server is started, which allows remote authorized and authenticated nodes to connect and trigger
 .\" visit_literal
 puppetd
 .\" depart_literal
@@ -1193,7 +1193,7 @@ Default: $confdir/modules:/usr/share/puppet/modules
 
 
 .SS name
-The name of the service, if we are running as one.  The default is essentially $0 without the path or 
+The name of the service, if we are running as one.  The default is essentially $0 without the path or
 .\" visit_literal
 .rb
 .\" depart_literal
@@ -1300,7 +1300,7 @@ Default: .svn CVS
 
 
 .SS pluginsource
-From where to retrieve plugins.  The standard Puppet 
+From where to retrieve plugins.  The standard Puppet
 .\" visit_literal
 file
 .\" depart_literal
@@ -1376,11 +1376,11 @@ Default: 8139
 
 
 .SS rails_loglevel
-The log level for Rails connections.  The value must be a valid log level within Rails.  Production environments normally use 
+The log level for Rails connections.  The value must be a valid log level within Rails.  Production environments normally use
 .\" visit_literal
 info
 .\" depart_literal
- and other environments normally use 
+ and other environments normally use
 .\" visit_literal
 debug
 .\" depart_literal
@@ -1532,7 +1532,7 @@ Default: webrick
 
 
 .SS show_diff
-Whether to print a contextual diff when files are being replaced.  The diff is printed on stdout, so this option is meaningless unless you are running Puppet interactively. This feature currently requires the 
+Whether to print a contextual diff when files are being replaced.  The diff is printed on stdout, so this option is meaningless unless you are running Puppet interactively. This feature currently requires the
 .\" visit_literal
 diff/lcs
 .\" depart_literal
@@ -1581,7 +1581,7 @@ Default: $runinterval
 
 
 .SS ssl_client_header
-The header containing an authenticated client\'s SSL DN.  Only used with Mongrel.  This header must be set by the proxy to the authenticated client\'s SSL DN (e.g., 
+The header containing an authenticated client\'s SSL DN.  Only used with Mongrel.  This header must be set by the proxy to the authenticated client\'s SSL DN (e.g.,
 .\" visit_literal
 /CN=puppet.reductivelabs.com
 .\" depart_literal
@@ -1744,4 +1744,4 @@ Default: $vardir/yaml
 
 
 .\" Generated by docutils manpage writer on 2008-05-05 09:33.
-.\" 
+.\"