puppet 2.7.14 → 2.7.16

data/man/man8/puppetd.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-AGENT" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-AGENT" "8" "June 2012" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-agent\fR \- The puppet agent daemon
@@ -13,7 +13,7 @@ Retrieves the client configuration from the puppet master and applies it to the
 This service may be run as a daemon, run periodically using cron (or something similar), or run interactively for testing purposes\.
 .
 .SH "USAGE"
-puppet agent [\-D|\-\-daemonize|\-\-no\-daemonize] [\-d|\-\-debug] [\-\-detailed\-exitcodes] [\-\-disable] [\-\-enable] [\-h|\-\-help] [\-\-certname \fIhost name\fR] [\-l|\-\-logdest syslog|\fIfile\fR|console] [\-o|\-\-onetime] [\-\-serve \fIhandler\fR] [\-t|\-\-test] [\-\-noop] [\-\-digest \fIdigest\fR] [\-\-fingerprint] [\-V|\-\-version] [\-v|\-\-verbose] [\-w|\-\-waitforcert \fIseconds\fR]
+puppet agent [\-\-certname \fIname\fR] [\-D|\-\-daemonize|\-\-no\-daemonize] [\-d|\-\-debug] [\-\-detailed\-exitcodes] [\-\-digest \fIdigest\fR] [\-\-disable] [\-\-enable] [\-\-fingerprint] [\-h|\-\-help] [\-l|\-\-logdest syslog|\fIfile\fR|console] [\-\-no\-client] [\-\-noop] [\-o|\-\-onetime] [\-\-serve \fIhandler\fR] [\-t|\-\-test] [\-v|\-\-verbose] [\-V|\-\-version] [\-w|\-\-waitforcert \fIseconds\fR]
 .
 .SH "DESCRIPTION"
 This is the main puppet client\. Its job is to retrieve the local machine\'s configuration from a remote server and apply it\. In order to successfully communicate with the remote server, the client must have a certificate signed by a certificate authority that the server trusts; the recommended method for this, at the moment, is to run a certificate authority as part of the puppet server (which is the default)\. The client will connect and request a signed certificate, and will continue connecting until it receives one\.
@@ -40,6 +40,10 @@ Note that any configuration parameter that\'s valid in the configuration file is
 See the configuration file documentation at http://docs\.puppetlabs\.com/references/stable/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet agent with \'\-\-genconfig\'\.
 .
 .TP
+\-\-certname
+Set the certname (unique ID) of the client\. The master reads this unique identifying string, which is usually set to the node\'s fully\-qualified domain name, to determine which configurations the node will receive\. Use this option to debug setup problems or implement unusual node identification schemes\.
+.
+.TP
 \-\-daemonize
 Send the process into the background\. This is the default\.
 .
@@ -52,12 +56,12 @@ Do not send the process into the background\.
 Enable full debugging\.
 .
 .TP
-\-\-digest
-Change the certificate fingerprinting digest algorithm\. The default is MD5\. Valid values depends on the version of OpenSSL installed, but should always at least contain MD5, MD2, SHA1 and SHA256\.
+\-\-detailed\-exitcodes
+Provide transaction information via exit codes\. If this is enabled, an exit code of \'2\' means there were changes, an exit code of \'4\' means there were failures during the transaction, and an exit code of \'6\' means there were both changes and failures\.
 .
 .TP
-\-\-detailed\-exitcodes
-Provide transaction information via exit codes\. If this is enabled, an exit code of \'2\' means there were changes, and an exit code of \'4\' means that there were failures during the transaction\. This option only makes sense in conjunction with \-\-onetime\.
+\-\-digest
+Change the certificate fingerprinting digest algorithm\. The default is MD5\. Valid values depends on the version of OpenSSL installed, but should always at least contain MD5, MD2, SHA1 and SHA256\.
 .
 .TP
 \-\-disable
@@ -77,8 +81,8 @@ Enable working on the local system\. This removes any lock file, causing \'puppe
 \'puppet agent\' exits after executing this\.
 .
 .TP
-\-\-certname
-Set the certname (unique ID) of the client\. The master reads this unique identifying string, which is usually set to the node\'s fully\-qualified domain name, to determine which configurations the node will receive\. Use this option to debug setup problems or implement unusual node identification schemes\.
+\-\-fingerprint
+Display the current certificate or certificate signing request fingerprint and then exit\. Use the \'\-\-digest\' option to change the digest algorithm used\.
 .
 .TP
 \-\-help
@@ -90,15 +94,15 @@ Where to send messages\. Choose between syslog, the console, and a log file\. De
 .
 .TP
 \-\-no\-client
-Do not create a config client\. This will cause the daemon to run without ever checking for its configuration automatically, and only makes sense
+Do not create a config client\. This will cause the daemon to run without ever checking for its configuration automatically, and only makes sense when puppet agent is being run with listen = true in puppet\.conf or was started with the \fB\-\-listen\fR option\.
 .
 .TP
-\-\-onetime
-Run the configuration once\. Runs a single (normally daemonized) Puppet run\. Useful for interactively running puppet agent when used in conjunction with the \-\-no\-daemonize option\.
+\-\-noop
+Use \'noop\' mode where the daemon runs in a no\-op or dry\-run mode\. This is useful for seeing what changes Puppet will make without actually executing the changes\.
 .
 .TP
-\-\-fingerprint
-Display the current certificate or certificate signing request fingerprint and then exit\. Use the \'\-\-digest\' option to change the digest algorithm used\.
+\-\-onetime
+Run the configuration once\. Runs a single (normally daemonized) Puppet run\. Useful for interactively running puppet agent when used in conjunction with the \-\-no\-daemonize option\.
 .
 .TP
 \-\-serve
@@ -109,10 +113,6 @@ Start another type of server\. By default, \'puppet agent\' will start a service
 Enable the most common options used for testing\. These are \'onetime\', \'verbose\', \'ignorecache\', \'no\-daemonize\', \'no\-usecacheonfailure\', \'detailed\-exit\-codes\', \'no\-splay\', and \'show_diff\'\.
 .
 .TP
-\-\-noop
-Use \'noop\' mode where the daemon runs in a no\-op or dry\-run mode\. This is useful for seeing what changes Puppet will make without actually executing the changes\.
-.
-.TP
 \-\-verbose
 Turn on verbose reporting\.
 .

data/man/man8/puppetdoc.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-DOC" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-DOC" "8" "June 2012" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-doc\fR \- Generate Puppet documentation and references
@@ -25,7 +25,7 @@ If the command is run with the name of a manifest file as an argument, puppet do
 .
 .TP
 \-\-all
-Output the docs for all of the reference types\. In \'rdoc\' modes, this also outputs documentation for all resources
+Output the docs for all of the reference types\. In \'rdoc\' mode, this also outputs documentation for all resources\.
 .
 .TP
 \-\-help
@@ -33,7 +33,7 @@ Print this help message
 .
 .TP
 \-\-outputdir
-Specifies the directory where to output the rdoc documentation in \'rdoc\' mode\.
+Used only in \'rdoc\' mode\. The directory to which the rdoc output should be written\.
 .
 .TP
 \-\-mode
@@ -47,6 +47,18 @@ Build a particular reference\. Get a list of references by running \'puppet doc
 \-\-charset
 Used only in \'rdoc\' mode\. It sets the charset used in the html files produced\.
 .
+.TP
+\-\-manifestdir
+Used only in \'rdoc\' mode\. The directory to scan for stand\-alone manifests\. If not supplied, puppet doc will use the manifestdir from puppet\.conf\.
+.
+.TP
+\-\-modulepath
+Used only in \'rdoc\' mode\. The directory or directories to scan for modules\. If not supplied, puppet doc will use the modulepath from puppet\.conf\.
+.
+.TP
+\-\-environment
+Used only in \'rdoc\' mode\. The configuration environment from which to read the modulepath and manifestdir settings, when reading said settings from puppet\.conf\. Due to a known bug, this option is not currently effective\.
+.
 .SH "EXAMPLE"
 .
 .nf

data/man/man8/puppetmasterd.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-MASTER" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-MASTER" "8" "June 2012" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-master\fR \- The puppet master daemon

data/man/man8/puppetqd.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-QUEUE" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-QUEUE" "8" "June 2012" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-queue\fR \- Queuing daemon for asynchronous storeconfigs

data/man/man8/puppetrun.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-KICK" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-KICK" "8" "June 2012" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-kick\fR \- Remotely control puppet agent
@@ -25,10 +25,42 @@ You will most likely have to run \'puppet kick\' as root to get access to the SS
 \'puppet kick\' reads \'puppet master\'\'s configuration file, so that it can copy things like LDAP settings\.
 .
 .SH "USAGE NOTES"
-Puppet kick is useless unless puppet agent is listening for incoming connections and allowing access to the \fBrun\fR endpoint\. This entails starting the agent with \fBlisten = true\fR in its puppet\.conf file, and allowing access to the \fB/run\fR path in its auth\.conf file; see \fBhttp://docs\.puppetlabs\.com/guides/rest_auth_conf\.html\fR for more details\.
+Puppet kick needs the puppet agent on the target machine to be running as a daemon, be configured to listen for incoming network connections, and have an appropriate security configuration\.
 .
 .P
-Additionally, due to a known bug, you must make sure a namespaceauth\.conf file exists in puppet agent\'s $confdir\. This file will not be consulted, and may be left empty\.
+The specific changes required are:
+.
+.IP "\(bu" 4
+Set \fBlisten = true\fR in the agent\'s \fBpuppet\.conf\fR file (or \fB\-\-listen\fR on the command line)
+.
+.IP "\(bu" 4
+Configure the node\'s firewall to allow incoming connections on port 8139
+.
+.IP "\(bu" 4
+Insert the following stanza at the top of the node\'s \fBauth\.conf\fR file:
+.
+.IP "" 4
+.
+.nf
+
+  # Allow puppet kick access
+  path    /run
+  method  save
+  auth    any
+  allow   workstation\.example\.com
+.
+.fi
+.
+.IP "" 0
+
+.
+.IP "" 0
+.
+.P
+This example would allow the machine \fBworkstation\.example\.com\fR to trigger a Puppet run; adjust the "allow" directive to suit your site\. You may also use \fBallow *\fR to allow anyone to trigger a Puppet run, but that makes it possible to interfere with your site by triggering excessive Puppet runs\.
+.
+.P
+See \fBhttp://docs\.puppetlabs\.com/guides/rest_auth_conf\.html\fR for more details about security settings\.
 .
 .SH "OPTIONS"
 Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'ssldir\' is a valid configuration parameter, so you can specify \'\-\-ssldir \fIdirectory\fR\' as an argument\.

data/man/man8/ralsh.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-RESOURCE" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-RESOURCE" "8" "June 2012" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-resource\fR \- The resource abstraction layer shell

data/spec/fixtures/unit/provider/package/gem/line-with-1.8.5-warning

@@ -0,0 +1,14 @@
+/home/jenkins/.rvm/gems/ruby-1.8.5-p231@global/gems/rubygems-bundler-0.9.0/lib/rubygems-bundler/regenerate_binstubs_command.rb:34: warning: parenthesize argument(s) for future version
+
+*** LOCAL GEMS ***
+
+columnize (0.3.2)
+diff-lcs (1.1.3)
+metaclass (0.0.1)
+mocha (0.10.5)
+rake (0.8.7)
+rspec-core (2.9.0)
+rspec-expectations (2.9.1)
+rspec-mocks (2.9.0)
+rubygems-bundler (0.9.0)
+rvm (1.11.3.3)

data/spec/fixtures/unit/provider/package/pkg/dummy_solaris11

@@ -0,0 +1 @@
+dummy                                    1.0.6-0.175.0.0.0.2.537    i--

data/spec/fixtures/unit/provider/package/pkg/solaris11

@@ -0,0 +1,12 @@
+compress/zip                                      3.0-0.175.0.0.0.2.537      i--
+archiver/gnu-tar                                  1.26-0.175.0.0.0.2.537     i--
+compress/bzip2                                    1.0.6-0.175.0.0.0.2.537    i--
+compress/gzip                                     1.3.5-0.175.0.0.0.2.537    i--
+compress/p7zip                                    9.20.1-0.175.0.0.0.2.537   i--
+compress/unzip                                    6.0-0.175.0.0.0.2.537      i--
+compress/zip                                      3.0-0.175.0.0.0.2.537      i--
+x11/library/toolkit/libxaw7                       1.0.9-0.175.0.0.0.0.1215   i--
+x11/library/toolkit/libxt                         1.0.9-0.175.0.0.0.0.1215   i--
+shell/bash                                        4.1.9-0.175.0.0.0.2.537    i--
+shell/zsh                                         4.3.12-0.175.0.0.0.2.537   i--
+security/sudo                                     1.8.1.2-0.175.0.0.0.2.537  i--

data/spec/fixtures/unit/provider/package/pkg/unknown_status

@@ -0,0 +1,12 @@
+compress/zip                                      3.0-0.175.0.0.0.2.537      i--
+archiver/gnu-tar                                  1.26-0.175.0.0.0.2.537     i--
+compress/bzip2                                    1.0.6-0.175.0.0.0.2.537    i--
+compress/gzip                                     1.3.5-0.175.0.0.0.2.537    i--
+compress/p7zip                                    9.20.1-0.175.0.0.0.2.537   i--
+compress/unzip                                    6.0-0.175.0.0.0.2.537      x--
+compress/zip                                      3.0-0.175.0.0.0.2.537      i--
+x11/library/toolkit/libxaw7                       1.0.9-0.175.0.0.0.0.1215   i--
+x11/library/toolkit/libxt                         1.0.9-0.175.0.0.0.0.1215   i--
+shell/bash                                        4.1.9-0.175.0.0.0.2.537    i--
+shell/zsh                                         4.3.12-0.175.0.0.0.2.537   i--
+security/sudo                                     1.8.1.2-0.175.0.0.0.2.537  i--

data/spec/fixtures/unit/provider/service/gentoo/rc_update_show

@@ -0,0 +1,30 @@
+            alsasound |      default                 
+             bootmisc | boot                         
+                devfs |                       sysinit
+              dmcrypt | boot                         
+                dmesg |                       sysinit
+                 fsck | boot                         
+             hostname | boot                         
+              hwclock | boot                         
+              keymaps | boot                         
+            killprocs |              shutdown        
+                local |      default                 
+           localmount | boot                         
+                  lvm | boot                         
+              modules | boot                         
+             mount-ro |              shutdown        
+                 mtab | boot                         
+               net.lo | boot                         
+             netmount |      default                 
+               procfs | boot                         
+                 root | boot                         
+              rsyslog | boot                         
+            savecache |              shutdown        
+                 swap | boot                         
+            swapfiles | boot                         
+               sysctl | boot                         
+         termencoding | boot                         
+                 udev |                       sysinit
+       udev-postmount |      default                 
+              urandom | boot                         
+                  xdm |      default                 

data/spec/integration/defaults_spec.rb

@@ -285,13 +285,8 @@ describe "Puppet defaults" do
   end
 
   describe "when configuring color" do
-    it "should default to ansi", :unless => Puppet.features.microsoft_windows? do
-      Puppet.settings[:color].should == 'ansi'
-    end
-
-    it "should default to false", :if => Puppet.features.microsoft_windows? do
-      Puppet.settings[:color].should == 'false'
-    end
+    subject { Puppet.settings[:color] }
+    it { should == "ansi" }
   end
 
   describe "daemonize" do

data/spec/integration/network/server/mongrel_spec.rb

@@ -1,30 +1,39 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 require 'puppet/network/server'
-require 'socket'
+require 'net/http'
 
 describe Puppet::Network::Server, :'fails_on_ruby_1.9.2' => true do
   describe "when using mongrel", :if => Puppet.features.mongrel? do
 
+    # This reduces the odds of conflicting port numbers between concurrent runs
+    # of the suite on the same machine dramatically.
+    def port
+      20001 + ($$ % 40000)
+    end
+
     before :each do
       Puppet[:servertype] = 'mongrel'
       Puppet[:server] = '127.0.0.1'
-      @params = { :port => 34346, :handlers => [ :node ] }
+      @params = { :port => port, :handlers => [ :node ] }
       @server = Puppet::Network::Server.new(@params)
     end
 
-    after { Puppet.settings.clear }
+    after :each do
+      @server.unlisten if @server.listening?
+    end
 
     describe "before listening" do
       it "should not be reachable at the specified address and port" do
-        lambda { TCPSocket.new('127.0.0.1', 34346) }.should raise_error(Errno::ECONNREFUSED)
+        lambda { Net::HTTP.get('127.0.0.1', '/', port) }.
+          should raise_error(Errno::ECONNREFUSED)
       end
     end
 
     describe "when listening" do
       it "should be reachable on the specified address and port" do
         @server.listen
-        lambda { TCPSocket.new('127.0.0.1', 34346) }.should_not raise_error
+        expect { Net::HTTP.get('127.0.0.1', '/', port) }.should_not raise_error
       end
 
       it "should default to '127.0.0.1' as its bind address" do
@@ -53,12 +62,9 @@ describe Puppet::Network::Server, :'fails_on_ruby_1.9.2' => true do
       it "should not be reachable on the port and address assigned" do
         @server.listen
         @server.unlisten
-        lambda { TCPSocket.new('127.0.0.1', 34346) }.should raise_error(Errno::ECONNREFUSED)
+        expect { Net::HTTP.get('127.0.0.1', '/', port) }.
+          should raise_error Errno::ECONNREFUSED
       end
     end
-
-    after :each do
-      @server.unlisten if @server.listening?
-    end
   end
 end

data/spec/integration/network/server/webrick_spec.rb

@@ -7,17 +7,24 @@ require 'socket'
 describe Puppet::Network::Server, :unless => Puppet.features.microsoft_windows? do
   include PuppetSpec::Files
 
+  # This reduces the odds of conflicting port numbers between concurrent runs
+  # of the suite on the same machine dramatically.
+  def port
+    20000 + ($$ % 40000)
+  end
+
   describe "when using webrick" do
     before :each do
       Puppet[:servertype] = 'webrick'
       Puppet[:server] = '127.0.0.1'
-      @params = { :port => 34343, :handlers => [ :node ], :xmlrpc_handlers => [ :status ] }
+      @params = { :port => port, :handlers => [ :node ] }
 
       # Get a safe temporary file
       dir = tmpdir("webrick_integration_testing")
 
       Puppet.settings[:confdir] = dir
       Puppet.settings[:vardir] = dir
+      Puppet.settings[:logdir] = dir
       Puppet.settings[:group] = Process.gid
 
       Puppet::SSL::Host.ca_location = :local
@@ -34,15 +41,15 @@ describe Puppet::Network::Server, :unless => Puppet.features.microsoft_windows?
 
     describe "before listening" do
       it "should not be reachable at the specified address and port" do
-        lambda { TCPSocket.new('127.0.0.1', 34343) }.should raise_error
+        lambda { TCPSocket.new('127.0.0.1', port) }.should raise_error
       end
     end
 
     describe "when listening" do
       it "should be reachable on the specified address and port" do
-        @server = Puppet::Network::Server.new(@params.merge(:port => 34343))
+        @server = Puppet::Network::Server.new(@params.merge(:port => port))
         @server.listen
-        lambda { TCPSocket.new('127.0.0.1', 34343) }.should_not raise_error
+        lambda { TCPSocket.new('127.0.0.1', port) }.should_not raise_error
       end
 
       it "should default to '0.0.0.0' as its bind address" do
@@ -53,16 +60,16 @@ describe Puppet::Network::Server, :unless => Puppet.features.microsoft_windows?
 
       it "should use any specified bind address" do
         Puppet[:bindaddress] = "127.0.0.1"
-        @server = Puppet::Network::Server.new(@params.merge(:port => 34343))
+        @server = Puppet::Network::Server.new(@params.merge(:port => port))
         @server.stubs(:unlisten) # we're breaking listening internally, so we have to keep it from unlistening
         @server.send(:http_server).expects(:listen).with { |args| args[:address] == "127.0.0.1" }
         @server.listen
       end
 
       it "should not allow multiple servers to listen on the same address and port" do
-        @server = Puppet::Network::Server.new(@params.merge(:port => 34343))
+        @server = Puppet::Network::Server.new(@params.merge(:port => port))
         @server.listen
-        @server2 = Puppet::Network::Server.new(@params.merge(:port => 34343))
+        @server2 = Puppet::Network::Server.new(@params.merge(:port => port))
         lambda { @server2.listen }.should raise_error
       end
 
@@ -73,10 +80,10 @@ describe Puppet::Network::Server, :unless => Puppet.features.microsoft_windows?
 
     describe "after unlistening" do
       it "should not be reachable on the port and address assigned" do
-        @server = Puppet::Network::Server.new(@params.merge(:port => 34343))
+        @server = Puppet::Network::Server.new(@params.merge(:port => port))
         @server.listen
         @server.unlisten
-        lambda { TCPSocket.new('127.0.0.1', 34343) }.should raise_error(Errno::ECONNREFUSED)
+        lambda { TCPSocket.new('127.0.0.1', port) }.should raise_error(Errno::ECONNREFUSED)
       end
     end
   end