puppet 2.6.3 → 2.6.4

data/CHANGELOG

@@ -1,5 +1,14 @@
+2.6.4
+=====
+76890a5  Revert "(#5304) Use internal_name rather than real_name for maillist provider"
+19f3879  Disable remote ralsh by default
+eee1a9c  (#5424) Ship auth.conf as part of installing from source
+779fea8  (#5304) Use internal_name rather than real_name for maillist provider
+83f878e  Renamed Reductive to Puppet
+
 2.6.3
 =====
+53bb805  Incremented CHANGELOG for 2.6.3
 184733c  [#5322] (#5322) Remove spec file that adds little value and causes failures
 178c2a6  Fix test failures that fixing #4726 exposed.
 74b6c09  (#4726) Fix RRD legacy support

data/ext/nagios/naggen

@@ -63,7 +63,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2009 Reductive Labs, LLC
+# Copyright (c) 2009 Puppet Labs, LLC
 # Licensed under the GPL 2
 
 require 'puppet'

data/ext/puppet-test

@@ -90,7 +90,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005, 2006 Reductive Labs, LLC
+# Copyright (c) 2005, 2006 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 # Do an initial trap, so that cancels don't get a stack trace.

data/install.rb

@@ -79,6 +79,7 @@ def glob(list)
 end
 
 # Set these values to what you want installed.
+configs = glob(%w{conf/auth.conf})
 sbins = glob(%w{sbin/*})
 bins  = glob(%w{bin/*})
 rdoc  = glob(%w{bin/* sbin/* lib/**/*.rb README README-library CHANGELOG TODO Install}).reject { |e| e=~ /\.(bat|cmd)$/ }
@@ -87,6 +88,14 @@ man   = glob(%w{man/man[0-9]/*})
 libs  = glob(%w{lib/**/*.rb lib/**/*.py lib/puppet/util/command_line/*})
 tests = glob(%w{test/**/*.rb})
 
+def do_configs(configs, target, strip = 'conf/')
+  Dir.mkdir(target) unless File.directory? target
+  configs.each do |cf|
+    ocf = File.join(InstallOptions.config_dir, cf.gsub(/#{strip}/, ''))
+    File.install(cf, ocf, 0644, true)
+  end
+end
+
 def do_bins(bins, target, strip = 's?bin/')
   Dir.mkdir(target) unless File.directory? target
   bins.each do |bf|
@@ -157,6 +166,8 @@ end
 def prepare_installation
   $operatingsystem = Facter["operatingsystem"].value
 
+  InstallOptions.configs = true
+
   # Only try to do docs if we're sure they have rdoc
   if $haverdoc
     InstallOptions.rdoc  = true
@@ -193,9 +204,15 @@ def prepare_installation
     opts.on('--[no-]tests', 'Prevents the execution of unit tests.', 'Default on.') do |ontest|
       InstallOptions.tests = ontest
     end
+    opts.on('--[no-]configs', 'Prevents the installation of config files', 'Default off.') do |ontest|
+      InstallOptions.configs = ontest
+    end
     opts.on('--destdir[=OPTIONAL]', 'Installation prefix for all targets', 'Default essentially /') do |destdir|
       InstallOptions.destdir = destdir
     end
+    opts.on('--configdir[=OPTIONAL]', 'Installation directory for config files', 'Default /etc/puppet') do |configdir|
+      InstallOptions.configdir = configdir
+    end
     opts.on('--bindir[=OPTIONAL]', 'Installation directory for binaries', 'overrides Config::CONFIG["bindir"]') do |bindir|
       InstallOptions.bindir = bindir
     end
@@ -209,15 +226,17 @@ def prepare_installation
       InstallOptions.mandir = mandir
     end
     opts.on('--quick', 'Performs a quick installation. Only the', 'installation is done.') do |quick|
-      InstallOptions.rdoc   = false
-      InstallOptions.ri     = false
-      InstallOptions.tests  = false
+      InstallOptions.rdoc    = false
+      InstallOptions.ri      = false
+      InstallOptions.tests   = false
+      InstallOptions.configs = true
     end
     opts.on('--full', 'Performs a full installation. All', 'optional installation steps are run.') do |full|
-      InstallOptions.rdoc   = true
-      InstallOptions.man    = true
-      InstallOptions.ri     = true
-      InstallOptions.tests  = true
+      InstallOptions.rdoc    = true
+      InstallOptions.man     = true
+      InstallOptions.ri      = true
+      InstallOptions.tests   = true
+      InstallOptions.configs = true
     end
     opts.separator("")
     opts.on_tail('--help', "Shows this help text.") do
@@ -243,6 +262,12 @@ def prepare_installation
     Config::CONFIG['sbindir'] = "/usr/sbin"
   end
 
+  if not InstallOptions.configdir.nil?
+    configdir = InstallOptions.configdir
+  else
+    configdir = "/etc/puppet"
+  end
+
   if not InstallOptions.bindir.nil?
     bindir = InstallOptions.bindir
   else
@@ -277,22 +302,26 @@ def prepare_installation
 
   # To be deprecated once people move over to using --destdir option
   if (destdir = ENV['DESTDIR'])
+    configdir = "#{destdir}#{configdir}"
     bindir = "#{destdir}#{bindir}"
     sbindir = "#{destdir}#{sbindir}"
     mandir = "#{destdir}#{mandir}"
     sitelibdir = "#{destdir}#{sitelibdir}"
 
+    FileUtils.makedirs(configdir) if InstallOptions.configs
     FileUtils.makedirs(bindir)
     FileUtils.makedirs(sbindir)
     FileUtils.makedirs(mandir)
     FileUtils.makedirs(sitelibdir)
   # This is the new way forward
   elsif (destdir = InstallOptions.destdir)
+    configdir = "#{destdir}#{configdir}"
     bindir = "#{destdir}#{bindir}"
     sbindir = "#{destdir}#{sbindir}"
     mandir = "#{destdir}#{mandir}"
     sitelibdir = "#{destdir}#{sitelibdir}"
 
+    FileUtils.makedirs(configdir) if InstallOptions.configs
     FileUtils.makedirs(bindir)
     FileUtils.makedirs(sbindir)
     FileUtils.makedirs(mandir)
@@ -303,6 +332,7 @@ def prepare_installation
 
   InstallOptions.tmp_dirs = tmpdirs.compact
   InstallOptions.site_dir = sitelibdir
+  InstallOptions.config_dir = configdir
   InstallOptions.bin_dir  = bindir
   InstallOptions.sbin_dir = sbindir
   InstallOptions.lib_dir  = libdir
@@ -459,6 +489,7 @@ prepare_installation
 #build_rdoc(rdoc) if InstallOptions.rdoc
 #build_ri(ri) if InstallOptions.ri
 #build_man(bins, sbins) if InstallOptions.man
+do_configs(configs, InstallOptions.config_dir) if InstallOptions.configs
 do_bins(sbins, InstallOptions.sbin_dir)
 do_bins(bins, InstallOptions.bin_dir)
 do_libs(libs)

data/lib/puppet.rb

@@ -24,7 +24,7 @@ require 'puppet/util/run_mode'
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-  PUPPETVERSION = '2.6.3'
+  PUPPETVERSION = '2.6.4'
 
   def Puppet.version
     PUPPETVERSION

data/lib/puppet/network/rest_authconfig.rb

@@ -17,7 +17,6 @@ module Puppet
       { :acl => "/certificate/", :method => :find, :authenticated => false },
       { :acl => "/certificate_request", :method => [:find, :save], :authenticated => false },
       { :acl => "/status", :method => [:find], :authenticated => true },
-      { :acl => "/resource", :method => [:find, :save, :search], :authenticated => true },
     ]
 
     def self.main

data/lib/puppet/util/command_line/filebucket

@@ -91,7 +91,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:filebucket].run

data/lib/puppet/util/command_line/pi

@@ -42,7 +42,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:describe].run

data/lib/puppet/util/command_line/puppet

@@ -63,7 +63,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:apply].run

data/lib/puppet/util/command_line/puppetca

@@ -104,7 +104,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:cert].run

data/lib/puppet/util/command_line/puppetd

@@ -180,7 +180,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005, 2006 Reductive Labs, LLC
+# Copyright (c) 2005, 2006 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:agent].run

data/lib/puppet/util/command_line/puppetdoc

@@ -3,7 +3,7 @@
 #
 # = Synopsis
 #
-# Generate a reference for all Puppet types.  Largely meant for internal Reductive
+# Generate a reference for all Puppet types.  Largely meant for internal Puppet
 # Labs use.
 #
 # = Usage
@@ -61,7 +61,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005-2007 Reductive Labs, LLC
+# Copyright (c) 2005-2007 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:doc].run

data/lib/puppet/util/command_line/puppetmasterd

@@ -59,7 +59,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:master].run

data/lib/puppet/util/command_line/puppetqd

@@ -47,7 +47,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2009 Reductive Labs, LLC
+# Copyright (c) 2009 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:queue].run

data/lib/puppet/util/command_line/puppetrun

@@ -120,7 +120,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:kick].run

data/lib/puppet/util/command_line/ralsh

@@ -83,7 +83,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005-2007 Reductive Labs, LLC
+# Copyright (c) 2005-2007 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:resource].run

data/man/man8/filebucket.8

@@ -102,4 +102,4 @@ server: The server to send the file to, instead of locally\.
 verbose: Print extra information\.
 .
 .P
-version: Print version information\.puppet filebucket \-b /tmp/filebucket /my/fileLuke KaniesCopyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public License
+version: Print version information\.puppet filebucket \-b /tmp/filebucket /my/fileLuke KaniesCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License

data/man/man8/pi.8

@@ -14,4 +14,4 @@ list: List all types
 meta: List all metaparameters
 .
 .P
-short: List only parameters without detailpuppet describe \-\-list puppet describe file \-\-providers puppet describe user \-s \-mDavid LutterkortCopyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public License
+short: List only parameters without detailpuppet describe \-\-list puppet describe file \-\-providers puppet describe user \-s \-mDavid LutterkortCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License

data/man/man8/puppetca.8

@@ -166,4 +166,4 @@ verify: Verify the named certificate against the local CA
 .fi
 .
 .IP "" 0
-$ puppet cert \-l culain\.madstop\.com $ puppet cert \-s culain\.madstop\.comLuke KaniesCopyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public License
+$ puppet cert \-l culain\.madstop\.com $ puppet cert \-s culain\.madstop\.comLuke KaniesCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License

data/man/man8/puppetd.8

@@ -280,4 +280,4 @@ waitforcert: This option only matters for daemons that do not yet
 .fi
 .
 .IP "" 0
-puppet agent \-\-server puppet\.domain\.comLuke KaniesCopyright (c) 2005, 2006 Reductive Labs, LLC Licensed under the GNU Public License
+puppet agent \-\-server puppet\.domain\.comLuke KaniesCopyright (c) 2005, 2006 Puppet Labs, LLC Licensed under the GNU Public License

data/man/man8/puppetdoc.8

@@ -2,7 +2,7 @@
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
 .TH "PUPPETDOC" "8" "August 2010" "" ""
-Generate a reference for all Puppet types\. Largely meant for internal Reductive Labs use\.puppet doc [\-a|\-\-all] [\-h|\-\-help] [\-o|\-\-outputdir \fIrdoc outputdir\fR] [\-m|\-\-mode \fItext|pdf|rdoc\fR]
+Generate a reference for all Puppet types\. Largely meant for internal Puppet Labs use\.puppet doc [\-a|\-\-all] [\-h|\-\-help] [\-o|\-\-outputdir \fIrdoc outputdir\fR] [\-m|\-\-mode \fItext|pdf|rdoc\fR]
 .
 .IP "" 4
 .
@@ -105,4 +105,4 @@ $ puppet doc /etc/puppet/manifests/site\.pp
 or
 .
 .P
-$ puppet doc \-m pdf \-r configurationLuke KaniesCopyright (c) 2005\-2007 Reductive Labs, LLC Licensed under the GNU Public License
+$ puppet doc \-m pdf \-r configurationLuke KaniesCopyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU Public License

data/man/man8/puppetmasterd.8

@@ -49,4 +49,4 @@ logdest: Where to send messages\. Choose between syslog, the
 verbose: Enable verbosity\.
 .
 .P
-version: Print the puppet version number and exit\.puppet masterLuke KaniesCopyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public License
+version: Print the puppet version number and exit\.puppet masterLuke KaniesCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License

data/man/man8/puppetqd.8

@@ -17,4 +17,4 @@ help: Print this help message
 verbose: Turn on verbose reporting\.
 .
 .P
-version: Print the puppet version number and exit\.puppet queueLuke KaniesCopyright (c) 2009 Reductive Labs, LLC Licensed under the GNU Public License
+version: Print the puppet version number and exit\.puppet queueLuke KaniesCopyright (c) 2009 Puppet Labs, LLC Licensed under the GNU Public License

data/man/man8/puppetrun.8

@@ -170,4 +170,4 @@ test: Print the hosts you would connect to but do not
 ping::
 .
 .P
-Do a ICMP echo against the target host\. Skip hosts that don\'t respond to ping\.sudo puppet kick \-p 10 \-t remotefile \-t webserver host1 host2Luke KaniesCopyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public License
+Do a ICMP echo against the target host\. Skip hosts that don\'t respond to ping\.sudo puppet kick \-p 10 \-t remotefile \-t webserver host1 host2Luke KaniesCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License

data/man/man8/ralsh.8

@@ -82,4 +82,4 @@ Print extra information\.This example uses \fBpuppet resource\fR to return Puppe
 .fi
 .
 .IP "" 0
-Luke KaniesCopyright (c) 2005\-2007 Reductive Labs, LLC Licensed under the GNU Public License
+Luke KaniesCopyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU Public License

data/spec/unit/network/rest_authconfig_spec.rb

@@ -17,7 +17,6 @@ describe Puppet::Network::RestAuthConfig do
     { :acl => "/certificate/", :method => :find, :authenticated => false },
     { :acl => "/certificate_request", :method => [:find, :save], :authenticated => false },
     { :acl => "/status", :method => [:find], :authenticated => true },
-    { :acl => "/resource", :method => [:find, :save, :search], :authenticated => true },
   ]
 
   before :each do

data/test/test

@@ -68,7 +68,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'find'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 2
   - 6
-  - 3
-  version: 2.6.3
+  - 4
+  version: 2.6.4
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +11:00
+date: 2010-12-02 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency