puppet 0.25.1 → 0.25.2

data/CHANGELOG

@@ -1,5 +1,155 @@
+0.25.2
+======
+6111ba8  Fix for temporary file security whole
+e7d98cc  Fix for #2999 (absent package handling on solaris)
+87136b4  Fix typo in documentation: wheter vs. whether.
+cbc2ef0  Partial rollback of refinements to fix for #2994
+fd631b9  Do not close stdout or stderr in execute.
+f878fe8  Update Red Hat spec file for 0.25.2
+
+0.25.2rc3
+=========
+4394c48  Updated CHANGELOG for 0.25.2rc3
+13cbf04  ReFix 2675 ending slash in directory should get stripped off
+5c6f07b  Use a pipe instead of a temp file for command output.
+7e64393  Additional fix for #2994 (followed symlinks do not have checksums)
+7e2e12b  Fix for #2995 (don't fail to load PSON when UTF-8 missing)
+c84186a  Revert "Fix for #2731 (problem communicating with processes in SELinux)"
+74d9693  Updated man pages for 0.25.2
+7e2b1e9  Fix for #2995 (don't fail to load PSON when UTF-8 missing)
+d1ff4b3  Fix for #2994 (undefined method "_file" message)
+4d81511  fix #2987 - check correct hash entry
+
+0.25.2rc2
+=========
+682000b  Updated CHANGELOG for 0.25.2rc2
+e4bb529  Fix for #2967 (RFC-1123 problem and regression on wildcarded domains)
+776be7c  Updated CHANGELOG
+
+0.25.2rc1
+=========
+a73f799  Updated version
+26e7486  Fixing failing tests
+05e897e  Fix for #2881 (ralsh doesn't find individual parsed resources)
+e04f9e4  Code smell reductions
+24654a2  Making provider/host/parser.rb compatible with host_aliases
+49530ad  Fixing #2964 updated resources cannot be collected until they are exported twice
+6ab2453  Fix for #2731 (problem communicating with processes in SELinux)
+0e5d264  Fix for #2940 (propogating nil rather than reporting the error)
+d60ea0e  A slide down the RFC-1123 slope towards MS Windows compatibility and chaos
+b185801  Fixing #2960 Test Failed: 'Puppet::Type::Mount::ProviderParsed when modifying the filesystem tab should write the mount to disk when :flush is called
+5e5c8b5  Fixing tests
+0cb5e7d  Fix for #2943 (Make puppet --apply respect --preferred_serialization_format)
+0884035  Fix #2970 spec/unit/provider/ssh_authorized_key/parsed.rb has order dependencies
+b86decc  Fix #2816 MySQL server has gone away
+854c065  Fix for #2813 (alias propety v. alias metapram)
+813cb58  Fix for #2765 (--no-fqdn regression in puppetrun)
+e9a0cb7  Fix for #2657 (retain old setting if config has syntax error)
+727ee72  Fix #2966 spec/unit/util/queue.rb can't be run twice
+8c8e921  Fixing #2963 spec/unit/util/autoload.rb depends on global state
+ea90daa  Fix for #2965 (Chatty SELinux message)
+fc221ff  Fixed RSpec deprecation error
+037b99a  Fixing #2958 inconsistent errors in spec/integration/bin/puppetmasterd.rb
+d11c750  Fix for #2951 (SELinux test errors on OS X)
+0dc2dba  Fix for #2890 (the cached certificates that would not die)
+03f37ac  Fix for #2950 (parens needed warning)
+61fd460  Fix #2924 Test Failed: Puppet::Indirector::FileContent::FileServer when finding files should find plugin file content in the environment specified in the request
+2432b23  Fixed test typo
+f5960ce  Closed #2937 - Migrated a number of requires to features
+2d88926  Fix for #2869 (SELinux tests failing under some load orderings)
+18c5165  Adds partial IPv6 support to authstore
+857047d  Fix for #2567 (Authstore does unintended/pointless DNS lookups)
+dddbd28  Enabling steps for #2567 (Authstore does unintended/pointless DNS lookups)
+ea0a43f  Fix 2948 Failing rests in spec/unit/rails.rb
+b6f4291  Fix #2923 failing tests in spec/unit/ssl/host.rb
+bf7c108  Fix #2677 Proper OIDs on puppet.schema for LDAP
+e0488b2  Fix #2808 puppetqd doesn't give an error when no config is given
+7b2e2ba  Fixing 2851 spec/unit/network/rest_authconfig.rb test descriptions change
+1c69af2  Fixing 2855 Inadvertent zlib dependency
+3528a7b  2850 spec/unit/application/puppetd.rb generates warnings if run with certain other tests
+d343af0  2876 spec/unit/indirector/catalog/compiler.rb changes behaviour
+a7fae47  Fix 2936 Insufficient mocks for webrick in spec/unit/network/http/webrick.rb
+b96b757  Fix for #887 (safely setting pager to cat for blastwave)
+d685f44  2633 file and line info on bad params in type/file
+4326eb2  Fix for #2817 (links created even when links property set to follow)
+118adc1  2875 spurious test failure in spec/integration/file_serving/content.rb
+0f63a54  2877 race condition in webrick
+4895329  Fix for #2921 (test not checking for what it really wanted)
+f47fa40  Fix for #2925 (accept higher versions of rspec)
+c261721  Fix for #2911 (Allow capital letters in selinux contexts)
+bf7d650  Fix for #2900 (rug output parsing too specific)
+cccbca4  Fix for #2786 (failed trying to backup directory in recursive purge)
+6dfac97  Fixing 2907 rspec crash when spec/unit/application/puppetrun.rb is run after spec/unit/util/ldap/connection.rb
+1c8d272  Fixing 2870 Spurious failures in spec/integration/ssl/certificate_request.rb
+979440f  Fixing 2862 spec/integration/file_serving/metadata.rb fails unless run with other tests
+e04d299  Fixing 2858 spec/unit/application/puppetmasterd.rb fails if run twice
+53a9805  Minimal fix for #2822
+9ac1ed6  Fix for #2863 (calling each on uninitialized tag list)
+bd9e06f  Feature 2827 Option to disable managing internal files
+8b66998  Fixing 2849 puppet changes sshkey alias every run if it is blank
+7136c85  Fixed spellquote function documentation
+de16fd3  Updated yumrepo type documentation
+d1fa7cf  Fixed --no-ca option in Gentoo also
+8b5b4b6  Fixed incorrect command line in Red Hat sysconfig file
+623d9c7  Fixing 2886: Failing specs in format_handler
+feb021f  Avoiding rspec bug which causes 'be_all' tests to always pass
+228f105  Removed some extraneous files from ext
+01c98f6  Fixed #2798 - Correct issue with crontab provider on AIX
+f7c5ceb  Fixing 2725 Error message when permissions incorrect on file server directory
+07b94b4  2842 Format debugging should be removed
+3abcc89  Fix #2783, take2 - puppetdoc should use environment to get modulepath/manifestdir
+f5dd6c8  Fix #2831 - puppetdoc doesn't cope with regex node
+4a06379  Fixing #2857 (quote nesting error)
+9a41c35  Fixing #2791 fs_find should follow symlinks
+5629092  Added additional documentation to file mode attribute.
+dc8812c  Fixing 2792 selinux tries to set properties on unsupported filesystes
+57632a0  fix #2854 - parse timestamps
+cb6bc27  fix regex for non-installed packages
+9cfe390  Fixing 2812 authorized_keys without comments fail
+53b3b86  Fix for ticket #2844 (file recursion generated vs. explicit prefix)
+8129caa  Fix for ticket #2700 -- check for @explicit_waitforcert in puppetd --test
+e32f980  Fixed #1806 - supplementary groups are not reset
+be7ff82  Fix 2768 maillist resource is broken
+48beaba  simplify and fix portage provider
+0ac0ce9  Implement tasks for git-based workflow.
+bd5dc64  Possible workaround for #2824 (MRI GC bug)
+c1e47a4  Fixing #2789 puppetrun fails without --tag
+106c9a9  Fixing 904 RDoc::usage incompatible with rubygems
+5ed2e26  rack: SSL Env vars can only be in Request.env
+7f2e5fc  Fix #2671, preferred_serialization_format does not complain about invalid values
+f0eaf20  Fixing #2764 ActiveRecord 2.1 support
+eaab789  Fix failing tests introduced by #2797
+55d8ffa  Fix #2810 - adapt tidy to new FileSet api
+236bacc  conf/redhat: Prevent killproc from removing /usr/sbin/puppetmasterd
+41f025c  Fixed ldap typo again
+6c2daa3  Fix #2783 - Puppetdoc rdoc should use environment to get modulepath/manifestdir
+5648666  Add Environment#manifestdir and small refactoring
+74a877e  Minimal fix for #2821 ("rake spec" is needlessly slow)
+cd10e6d  Added package signing task
+ca56aa7  Least kludgy patch for #2675
+adc0a4e  Fix for #2661 and related issues
+65f601a  Fixing 2806 Specifying multiple tags fails to apply any of them
+e2c675e  Updated generate function documentation to make it clear it runs on the master
+53f40bd  Fix #2681 Incorrectly duplicating resources
+3fdc8ef  Ticket #2770 (deserializing Exec[...]s with "\n"s)
+b172287  Fixing #2767 invoke-rc.d warnings
+4013560  Fix #2797 - tags are not inherited by recursed file sub child
+f05a04e  Fix #2784 - puppetdoc/rdoc didn't parse mono-instruction class content
+38ec9fc  Fix #2796 - Fix puppetdoc rdoc selector parsing
+5f7177e  Fix #2795 - puppetdoc rdoc reports a better error message
+136949d  Fixing #2631 show_diff sometimes doesn't happen
+cb3e5e1  Fix #2787 - Storeconfig doesn't store/update node ip and environment anymore
+ff23b57  Fix for #2670, Puppet silently ignores catalog_format
+ee13efa  Add docs to Mac OS X package creation script and clean out old docs in the preflight
+b8470b8  Fix #2757 & CSR 92 (symlinks in recursively managed dirs)
+5b750c2  Fix #2769 - default schedule are not defined
+eca338c  Fix for #2772 (webrick test failures)
+b1c57e9  Al Hoang's patch for #2781, removing obsolete when/: syntax
+50e9c98  Follow-on for #2724 - Adding an external node classifier
+
 0.25.1
 ======
+2f0b1e5  Updated CHANGELOG
 20e5222  Fixing #2689 - file owner warnings are reduced
 09fb3f7  Fixing #2752 - "require" loads "include"
 6846c32  Fixing some recently broken Scope tests
@@ -24,6 +174,9 @@ b4bcfe9  Fix for #2736, target doesn't work for ssh_authorized_keys
 ae528f6  Ticket #2734 PSON/JSON not serializing classes of a catalog
 f59f805  Bug #1900 Parsing of quoted $ in stdin
 6ba122f  Fixing #2735 - node classes are immed. added to classlist
+
+0.25.1rc2
+=========
 bca3b70  Bundling of pure ruby json lib as "pson"
 ce46be5  Proposed alternative solution for #2664 (REGEX / DIV lexing)
 b0518c3  Fix for #2681 (duplicate resource)
@@ -38,6 +191,9 @@ ad86e9e  Fixes #2688. Macauthorization provider now handles booleans internally
 d891f7a  Ticket #2676 (a typo)
 bfba2cd  Fix #2672 - Make sure nodenames keep their underscores when used as classname
 db67e5f  Added rcov exclusion to Rakefile
+
+0.25.1rc1
+=========
 6912a7e  Incremented version to 0.25.1
 fd322da  Fixes #1538 - Fixes the yumrepo backtrace in noop mode.
 6551e86  Fix #2664 - Mathematic expressions mis-lexed as Regex
@@ -277,138 +433,6 @@ a6816ff  Set ENV['PATH'] to an empty string if non-existent
 603b9cf  Change the diff default output to "unified"
 9bc9b5c  Added missing colon to suntab
 0f2d70d  Fixed #2087 and refactored the code that gets the smf service state
-3f070c1  Using the logging utilities to clean up module warnings
-feb7f89  Fixing #1064 - Deprecating module 'plugins' directories
-ccf4e69  Removing deprecated :pluginpath setting
-4036de9  Fixing #2094 - filebucket failures are clearer now
-ed876e0  Refactoring part of the file/filebucket integration
-bd81c25  Adding tests for file/backup behaviour
-c45ebfa  Fixed pi binary so --meta option works and updated documentation
-d2080a5  Fixing #2323 - Modules use environments correctly
-b9e632f  Fixed #2102 - Rails feature update fixed for Debian and Ubuntu
-1c4ef61  Fixed #2052 - Added -e option to puppet --help output
-d332333  Fix #2333 - Make sure lexer skip whitespace on non-token
-5fbf63c  Updated split function and add split function unit tests (courtesy of Thomas Bellman)
-a585bdd  * provider/augeas: strip whitespace and ignore blank lines
-a94d2de  Fixed pi tests
-5f7455e  Fixed #2222 - Cleanup pi binary options and --help output
-134ae3e  Fixing #2329 - puppetqd tests now pass
-de55e19  Cleaning up scope tests a bit
-e4ae870  Fixing #2336 - qualified variables only throw warnings
-607b01e  Fix #2246 - take2: make sure we run the rails tag query only when needed
-06b919d  Fix collector specs which were not working
-2945f8d  Make sure overriding a tag also produces a tag
-e142ca6  Removed a unit test which tested munging which is no longer done in the type
-d8ee6cf  Clearn up a parsing error reported by the tests
-446557f  vim: several improvements + cleanup
-9152678  Fixed #2229 - Red Hat init script error
-b5a8c4d  Fix #1907 (or sort) - 'require' puppet function
-74730df  #2332: Remove trailing slashes from path commands in the plugin
-1a89455  Changing the preferred serialization format to json
-0de70b7  Switching Queueing to using JSON instead of YAML
-7b33b6d  Adding JSON support to Catalogs
-c0bd0aa  Providing JSON support to the Resource class
-c16fd1b  Adding a JSON utility module for providing Ruby compat
-f059c51  Adding JSON support to Puppet::Relationship
-7f322b3  Adding a JSON format
-7666597  Allowing formats to specify the individual method names to use
-d40068f  Allowing formats to specify the methods they require
-024ccf5  Adding a "json" feature
-c8b382d  Fix some tests who were missing some actions
-f9516d4  Make sure virtual and rails query use tags when tag are searched
-b5855ec  Make sure resources are tagged with the user tag on the server
-d69fffb  Fix #2246 - Array tagged resources can't be collected or exported
-6ce0d1e  Partial fix for #2329
-4f2c066  Removed extra whitespace from end of lines
-97e6975  Changed indentation to be more consistent with style guide (4 spaces per level)
-41ce18c  Changed tabs to spaces without interfering with indentation or alignment
-f3b4092  Fix #2308 - Mongrel should use X-Forwarded-For
-7b0413e  Fixes Bug #2324 - Puppetd fails to start without rails
-48d5e8c  Enhance versioncmp documentation
-ef56ba5  * provider/augeas: minor spec test cleanup
-d322329  * provider/augeas: allow escaped whitespace and brackets in paths
-9735c50  * provider/augeas: match comparison uses '==' and '!=' again
-dbfa61b  * provider/augeas (process_match): no match results in empty array
-386923e  * provider/augeas: remove useless checks for nil
-171669a  * provider/augeas: simplify evaluation in process_get/match
-51cc752  * provider/augeas (open_augeas): use Augeas flag names, not ints
-4951cdf  * provider/augeas: ensure Augeas connection is always closed
-0d5a24d  * provider/augeas: minor code cleanup
-cea7bb5  * provider/augeas (parse_commands): use split to split string into lines
-95bd826  * provider/augeas: remove trailing whitespace (no functional change)
-7c5125b  Brought in lutters parse_commands patch and integrated it into the type.
-6ce8154  Removed --no-chain-reply-to in rake mail_patches task
-4ef7bba  Removing --no-thread from the mail_patches rake target
-508934b  Fixing a bunch of warnings
-fb0ed7a  Fixing tests broken by a recent fix to Cacher
-650029e  Always providing a value for 'exported' on Rails resources
-f1dba91  Fixing #2230 - exported resources work again
-5522eb8  Disabling the catalog cache, so puppetqd is compatible with storeconfigs
-abbb282  Fixing the rails feature to be compatible with 2.1+
-907b39b  Using Message acknowledgement in queueing
-42247f0  Fixing #2315 - ca --generate works again
-d7be033  Fix #2220 - Make sure stat is refreshed while managing Files
-e4d5966  Added puppet branding to format patch command
-00d5139  vim: Remove another mention of 'site' from syntax
-9067abd  vim: Highlight parameters with 'plusignment' operator
-736b0e4  vim: Highlight strings in single quotes
-ce01c95  vim: Clean up syntax spacing
-3af2dbf  JRuby OpenSSL implementation is more strict than real ruby one and
-62534a1  Logging when a cached catalog is used.
-ff5c44f  Changing Puppet::Cacher::Expirer#expired? method name
-e3d4c8e  Fixing #2240 - external node failures now log output
-bc1445b  Fixing #2237 - client_yaml dir is always created by puppetd
-e0c19f9  Fixing #2228 - --logdest works again in puppetd and puppetmasterd
-ab34cf6  Fixing puppetmasterd tests when missing rack
-9d5d0a0  Fixing the Agent so puppetrun actually works server-side
-b0ef08b  Fixing #2248 - --no-client correctly leaves off client
-b83b159  Fixing #2243 - puppetrun works again
-3d2189f  Fixed #2304 - Added naggen script to directly generate nagios configuration files from a StoreConfigs Rails database
-700ad5b  Sync conf/redhat/puppet.spec with Fedora/EPEL
-3ec3f91  Fixed #2280 - Detailed exit codes fix
-f98d49f  Fixing #2253 - pluginsync failures propagate correctly
-d860a2f  Fixing a transaction test that had some broken plumbing
-a728757  Refactoring resource generation slightly
-6e824d8  Adding a Spec lib directory and moving tmpfile to it
-1d69dbf  Extracting a method from eval_resource in Transaction
-7650fb2  Not trying to load files that get removed in pluginsyncing
-3995e70  Fix #2300 - Update ssh_authorized_key documentation
-cb4a4d3  Changed version to allow Rake to work.  Minor
-99f666f  enable maillist on centos, redhat, fedora
-e13befa  Fixing #2288 - fixing the tests broken by my attr_ttl code
-a406d58  Fix for #2234: test fails with old Rack version
-c189b46  Fixing #2273 - file purging works more intuitively
-138f19f  Caching whether named autoloaded files are missing
-415553e  Adding caching of file metadata to the autoloader
-d489a2b  Adding modulepath caching to the Autoloader
-5f1c228  Adding caching to the Environment class
-047ab78  Adding TTL support to attribute caching
-6a413d2  Fixed #2666 - Broken docstring formatting
-469604f  Deprecating factsync - pluginsync should be used instead
-d39c485  Added spec and unit tests to the Rakefile files list and fixed CI rake tasks
-e1a7f84  Added install.rb to Rakefile package task
-e180a91  Fixed #2271 - Fix to puppetd documentation
-4bf2980  Protecting Stomp client against internal failures
-f4cb8f3  Adding some usability bits to puppetqd
-a18298a  Refactoring the stomp client and tests a bit
-2771918  Relying on threads rather than sleeping for puppetqd
-07ff4be  Fixing #2250 - Missing templates throw a helpful error
-7ce42da  Fixing #2273 - CA location is set correctly in puppetca
-e1779c7  RackXMLRPC: buffer request contents in memory, as a real string.
-fb957cc  Modules now can find their own paths
-c608409  Moving file-searching code out of Puppet::Module
-83ba0e5  Fixing #2234 - fixing all of the tests broken by my bindaddress fix
-4f3a67f  Fixing #2221 - pluginsignore should work again
-2d580c2  Fix snippets tests failing because of activated storeconfigs
-8c718c9  Fix failing test: file.close! and file.path ordering fix
-17f2c7d  Confine stomp tests to Stomp enabled systems
-6a80b76  Fix some master failing tests
-172422f  Fix bug #2124 - ssh_authorized_key always changes target if target is not defined
-f945b66  Fixing #2265 - rack is loaded with features rather than manually
-5aef915  Added .git to pluginsignore default list of ignores
-6db5e8d  Cleanup of the Puppet Rakefile and removal of the requirement for the Reductive Build Library
-5cc4910  Fix #1409 once again, including test
-a6af5bf  Added split function
 
 0.25.0
 ======
@@ -614,9 +638,6 @@ a6816ff  Set ENV['PATH'] to an empty string if non-existent
 603b9cf  Change the diff default output to "unified"
 9bc9b5c  Added missing colon to suntab
 0f2d70d  Fixed #2087 and refactored the code that gets the smf service state
-
-0.25.0beta2
-===========
 3f070c1  Using the logging utilities to clean up module warnings
 feb7f89  Fixing #1064 - Deprecating module 'plugins' directories
 ccf4e69  Removing deprecated :pluginpath setting
@@ -749,6 +770,9 @@ f945b66  Fixing #2265 - rack is loaded with features rather than manually
 6db5e8d  Cleanup of the Puppet Rakefile and removal of the requirement for the Reductive Build Library
 5cc4910  Fix #1409 once again, including test
 a6af5bf  Added split function
+
+0.25.0beta1
+===========
 2dd55fc  Fixing #2200 - puppetqd expects Daemon to be a class
 c016062  Removing unneeded test stubs
 1a2e1bc  Fixing #2195 - the Server class handles bindaddress

data/Rakefile

@@ -20,6 +20,7 @@ FILES = FileList[
     'man/**/*',
     'examples/**/*',
     'ext/**/*',
+    'tasks/**/*',
     'test/**/*',
     'spec/**/*'
 ]
@@ -34,6 +35,7 @@ task :default do
     sh %{rake -T}
 end
 
+desc "Create the tarball and the gem - use when releasing"
 task :puppetpackages => [:create_gem, :package]
 
 desc "Run the specs under spec/"
@@ -41,13 +43,14 @@ task :spec do
     require 'spec'
     require 'spec/rake/spectask'
     begin
-        require 'rcov'
+#        require 'rcov'
     rescue LoadError
     end
 
     Spec::Rake::SpecTask.new do |t|
         t.spec_opts = ['--format','s', '--loadby','mtime']
         t.spec_files = FileList['spec/**/*.rb']
+        t.fail_on_error = false
         if defined?(Rcov)
             t.rcov = true
             t.rcov_opts = ['--exclude', 'spec/*,test/*,results/*,/usr/lib/*,/usr/local/lib/*']

data/conf/gentoo/conf.d/puppetmaster

@@ -9,4 +9,4 @@ PUPPETMASTER_PID_DIR="/var/run/puppet"
 #PUPPETMASTER_LOG="syslog"
 
 # You may specify other parameters to the puppetmaster here
-#PUPPETMASTER_EXTRA_OPTS="--noca"
+#PUPPETMASTER_EXTRA_OPTS="--no-ca"

data/conf/osx/createpackage.sh

@@ -54,6 +54,17 @@ function install_puppet() {
   chown -R root:admin "${pkgroot}"
 }
 
+function install_docs() {
+  echo "Installing docs to ${pkgroot}"
+  docdir="${pkgroot}/usr/share/doc/puppet" 
+  mkdir -p "${docdir}"
+  for docfile in CHANGELOG CHANGELOG.old COPYING LICENSE README README.queueing README.rst; do
+    install -m 0644 "${puppet_root}/${docfile}" "${docdir}"
+  done
+  chown -R root:wheel "${docdir}"
+  chmod 0755 "${docdir}"
+}
+
 function get_puppet_version() {
   puppet_version=$(RUBYLIB="${pkgroot}/${SITELIBDIR}:${RUBYLIB}" ruby -e "require 'puppet'; puts Puppet.version")
 }
@@ -156,6 +167,7 @@ function main() {
   fi
 
   install_puppet
+  install_docs
   get_puppet_version
 
   if [ ! "${puppet_version}" ]; then

data/conf/osx/preflight

@@ -11,6 +11,10 @@
 /bin/rm -Rf "${3}{SITELIBDIR}/puppet"
 /bin/rm -Rf "${3}{SITELIBDIR}/puppet.rb"
 
+# remove old doc files
+
+/bin/rm -Rf "${3}/usr/share/doc/puppet"
+
 # In puppet 0.24.x these executables lived in bindir, but in 0.25.x they
 # have been moved to sbindir. This cleans out old ones before installing.
 /bin/rm -Rf "${3}{BINDIR}/puppetca"

data/conf/redhat/puppet.spec

@@ -5,7 +5,7 @@
 %define confdir conf/redhat
 
 Name:           puppet
-Version:        0.25.1
+Version:        0.25.2
 Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
@@ -82,6 +82,9 @@ chmod +x ext/puppetstoredconfigclean.rb
 find examples/ -type f -empty | xargs rm
 find examples/ -type f | xargs chmod a-x
 
+# puppet-queue.conf is more of an example, used for stompserver
+mv conf/puppet-queue.conf examples/etc/puppet/
+
 %install
 rm -rf %{buildroot}
 ruby install.rb --destdir=%{buildroot} --quick --no-rdoc
@@ -96,6 +99,7 @@ install -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/syscon
 install -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster
 install -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
 install -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
+install -Dp -m0644 conf/auth.conf %{buildroot}%{_sysconfdir}/puppet/auth.conf
 install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
 
 # We need something for these ghosted files, otherwise rpmbuild
@@ -123,7 +127,7 @@ install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
 
 %files
 %defattr(-, root, root, 0755)
-%doc CHANGELOG COPYING LICENSE README examples
+%doc CHANGELOG COPYING LICENSE README README.queueing examples
 %{_bindir}/pi
 %{_bindir}/puppet
 %{_bindir}/ralsh
@@ -136,6 +140,7 @@ install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
 %dir %{_sysconfdir}/puppet
 %config(noreplace) %{_sysconfdir}/sysconfig/puppet
 %config(noreplace) %{_sysconfdir}/puppet/puppet.conf
+%config(noreplace) %{_sysconfdir}/puppet/auth.conf
 %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetca.conf
 %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
@@ -169,6 +174,7 @@ install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
 %{_mandir}/man8/filebucket.8.gz
 %{_mandir}/man8/puppetmasterd.8.gz
 %{_mandir}/man8/puppetrun.8.gz
+%{_mandir}/man8/puppetqd.8.gz
 
 # Fixed uid/gid were assigned in bz 472073 (Fedora), 471918 (RHEL-5),
 # and 471919 (RHEL-4)
@@ -214,6 +220,10 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Fri Jan 01 2010 Todd Zullinger <tmz@pobox.com> - 0.25.2-1
+- Update to 0.25.2
+- Install auth.conf, puppetqd manpage, and queuing examples/docs
+
 * Tue Oct 20 2009 Todd Zullinger <tmz@pobox.com> - 0.25.1-1
 - Update to 0.25.1
 - Include the pi program and man page (R.I.Pienaar)