diff options
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/client/master.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/config.rb | 12 | ||||
| -rw-r--r-- | lib/puppet/parser/ast.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/parser/interpreter.rb | 18 | ||||
| -rwxr-xr-x | lib/puppet/server/fileserver.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/sslcertificates/ca.rb | 38 |
6 files changed, 38 insertions, 38 deletions
diff --git a/lib/puppet/client/master.rb b/lib/puppet/client/master.rb index be7f3748d..f9694fb3d 100644 --- a/lib/puppet/client/master.rb +++ b/lib/puppet/client/master.rb @@ -1,7 +1,7 @@ # The client for interacting with the puppetmaster config server. class Puppet::Client::MasterClient < Puppet::Client Puppet.setdefaults("puppetd", - [:puppetdlockfile, "$statedir/puppetdlock", + :puppetdlockfile => [ "$statedir/puppetdlock", "A lock file to temporarily stop puppetd from doing anything."] ) diff --git a/lib/puppet/config.rb b/lib/puppet/config.rb index aa9f6f9c7..dd08552a5 100644 --- a/lib/puppet/config.rb +++ b/lib/puppet/config.rb @@ -253,7 +253,7 @@ class Config when String, Integer, Float: # nothing klass = CElement else - raise Puppet::Error, "Invalid value '%s' for %s" % [value, param] + raise Puppet::Error, "Invalid value '%s' for %s" % [value, hash[:name]] end element = klass.new(hash) element.parent = self @@ -345,16 +345,16 @@ class Config # Set a bunch of defaults in a given section. The sections are actually pretty # pointless, but they help break things up a bit, anyway. - def setdefaults(section, *defs) + def setdefaults(section, defs) section = symbolize(section) - #hash.each { |param, value| - defs.each { |hash| + defs.each { |name, hash| if hash.is_a? Array tmp = hash hash = {} - [:name, :default, :desc].zip(tmp).each { |p, v| hash[p] = v } + [:default, :desc].zip(tmp).each { |p,v| hash[p] = v } end - hash[:name] = symbolize(hash[:name]) + name = symbolize(name) + hash[:name] = name hash[:section] = section name = hash[:name] if @config.include?(name) diff --git a/lib/puppet/parser/ast.rb b/lib/puppet/parser/ast.rb index 7aedfb1cc..03f390fa9 100644 --- a/lib/puppet/parser/ast.rb +++ b/lib/puppet/parser/ast.rb @@ -12,8 +12,8 @@ module Puppet AST = Puppet::Parser::AST Puppet.setdefaults("ast", - [:typecheck, true, "Whether to validate types during parsing."], - [:paramcheck, true, "Whether to validate parameters during parsing."] + :typecheck => [true, "Whether to validate types during parsing."], + :paramcheck => [true, "Whether to validate parameters during parsing."] ) attr_accessor :line, :file, :parent, :scope diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb index 5e4844498..73234fbf9 100644 --- a/lib/puppet/parser/interpreter.rb +++ b/lib/puppet/parser/interpreter.rb @@ -11,25 +11,25 @@ module Puppet module Parser class Interpreter Puppet.setdefaults("ldap", - [:ldapnodes, false, + :ldapnodes => [false, "Whether to search for node configurations in LDAP."], - [:ldapserver, "ldap", + :ldapserver => ["ldap", "The LDAP server. Only used if ``ldapnodes`` is enabled."], - [:ldapport, 389, + :ldapport => [389, "The LDAP port. Only used if ``ldapnodes`` is enabled."], - [:ldapstring, "(&(objectclass=puppetClient)(cn=%s))", + :ldapstring => ["(&(objectclass=puppetClient)(cn=%s))", "The search string used to find an LDAP node."], - [:ldapattrs, "puppetclass", + :ldapattrs => ["puppetclass", "The LDAP attributes to use to define Puppet classes. Values should be comma-separated."], - [:ldapparentattr, "parentnode", + :ldapparentattr => ["parentnode", "The attribute to use to define the parent node."], - [:ldapuser, "", + :ldapuser => ["", "The user to use to connect to LDAP. Must be specified as a full DN."], - [:ldappassword, "", + :ldappassword => ["", "The password to use to connect to LDAP."], - [:ldapbase, "", + :ldapbase => ["", "The search base for LDAP searches. It's impossible to provide a meaningful default here, although the LDAP libraries might have one already set. Generally, it should be the 'ou=Hosts' diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb index 067f1da0f..eb49a7d3e 100755 --- a/lib/puppet/server/fileserver.rb +++ b/lib/puppet/server/fileserver.rb @@ -9,7 +9,7 @@ class Server attr_accessor :local Puppet.setdefaults("fileserver", - [:fileserverconfig, "$confdir/fileserver.conf", + :fileserverconfig => ["$confdir/fileserver.conf", "Where the fileserver configuration is stored."]) #CHECKPARAMS = %w{checksum type mode owner group} diff --git a/lib/puppet/sslcertificates/ca.rb b/lib/puppet/sslcertificates/ca.rb index 901b098bf..9fec908d6 100644 --- a/lib/puppet/sslcertificates/ca.rb +++ b/lib/puppet/sslcertificates/ca.rb @@ -3,38 +3,38 @@ class Puppet::SSLCertificates::CA attr_accessor :keyfile, :file, :config, :dir, :cert Puppet.setdefaults("ca", - [:certdir, "$ssldir/certs", "The certificate directory."], - [:publickeydir, "$ssldir/public_keys", "The public key directory."], - [:privatekeydir, "$ssldir/private_keys", "The private key directory."], - [:cadir, "$ssldir/ca", + :certdir => ["$ssldir/certs", "The certificate directory."], + :publickeydir => ["$ssldir/public_keys", "The public key directory."], + :privatekeydir => ["$ssldir/private_keys", "The private key directory."], + :cadir => ["$ssldir/ca", "The root directory for the certificate authority."], - [:cacert, "$cadir/ca_crt.pem", "The CA certificate."], - [:cakey, "$cadir/ca_key.pem", "The CA private key."], - [:capub, "$cadir/ca_pub.pem", "The CA public key."], - [:caprivatedir, "$cadir/private", + :cacert => ["$cadir/ca_crt.pem", "The CA certificate."], + :cakey => ["$cadir/ca_key.pem", "The CA private key."], + :capub => ["$cadir/ca_pub.pem", "The CA public key."], + :caprivatedir => ["$cadir/private", "Where the CA stores private certificate information."], - [:csrdir, "$cadir/requests", + :csrdir => ["$cadir/requests", "Where the CA stores certificate requests"], - [:signeddir, "$cadir/signed", + :signeddir => ["$cadir/signed", "Where the CA stores signed certificates."], - [:capass, "$caprivatedir/ca.pass", + :capass => ["$caprivatedir/ca.pass", "Where the CA stores the password for the private key"], - [:serial, "$cadir/serial", + :serial => ["$cadir/serial", "Where the serial number for certificates is stored."], - [:privatedir, "$ssldir/private", + :privatedir => ["$ssldir/private", "Where the client stores private certificate information."], - [:passfile, "$privatedir/password", + :passfile => ["$privatedir/password", "Where puppetd stores the password for its private key. Generally unused."], - [:autosign, "$confdir/autosign.conf", + :autosign => ["$confdir/autosign.conf", "Whether to enable autosign. Valid values are true (which autosigns any key request, and is a very bad idea), false (which never autosigns any key request), and the path to a file, which uses that configuration file to determine which keys to sign."], - [:ca_days, 1825, "How long a certificate should be valid."], - [:ca_md, "md5", "The type of hash used in certificates."], - [:req_bits, 2048, "The bit length of the certificates."], - [:keylength, 1024, "The bit length of keys."] + :ca_days => [1825, "How long a certificate should be valid."], + :ca_md => ["md5", "The type of hash used in certificates."], + :req_bits => [2048, "The bit length of the certificates."], + :keylength => [1024, "The bit length of keys."] ) #@@params.each { |param| |