puppet 0.25.4 → 0.25.5

data/LICENSE

@@ -1,6 +1,6 @@
-Puppet - Automating Configuration Management. Copyright (C) 2005 Reductive Labs LLC
+Puppet - Automating Configuration Management. Copyright (C) 2005 Puppet Labs LLC
 
-Reductive Labs can be contacted at: info@reductivelabs.com
+Puppet Labs can be contacted at: info@puppetlabs.com
 
 This program and entire repository is free software; you can
 redistribute it and/or modify it under the terms of the GNU

data/README

@@ -1,5 +1,5 @@
 Documentation (and detailed install instructions) can be found
-online at http://reductivelabs.com/trac/puppet/wiki/DocumentationStart .
+online at http://puppetlabs.com/trac/puppet/wiki/DocumentationStart .
 
 Generally, you need the following things installed:
 
@@ -22,6 +22,6 @@ Generally, you need the following things installed:
   the library.
 
 * Facter => 1.5.1
-  You can get this from < http://reductivelabs.com/projects/facter >
+  You can get this from < http://puppetlabs.com/projects/facter >
 
 $Id$

data/README.queueing

@@ -8,7 +8,7 @@ Queue Daemon).
 Currently this is only supported for "Storeconfigs" which is
 documented at:
 
-http://reductivelabs.com/trac/puppet/wiki/UsingStoredConfiguration
+http://puppetlabs.com/trac/puppet/wiki/UsingStoredConfiguration
 
 In the future this feature can be extended to any new puppet
 data which involves storage in a database.

data/README.rst

@@ -34,5 +34,5 @@ Generally, you need the following things installed:
 * Facter => 1.1.1
   You can get this from your package management system or the `Facter site`_
 
-.. _Puppet Wiki: http://reductivelabs.com/trac/puppet/wiki/DocumentationStart
-.. _Facter site: http://reductivelabs.com/projects/facter
+.. _Puppet Wiki: http://puppetlabs.com/trac/puppet/wiki/DocumentationStart
+.. _Facter site: http://puppetlabs.com/projects/facter

data/Rakefile

@@ -1,13 +1,15 @@
 # Rakefile for Puppet -*- ruby -*-
 
-$: << File.expand_path('lib')
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks')
 
-require './lib/puppet.rb'
 require 'rake'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 
+module Puppet
+    PUPPETVERSION = File.read('lib/puppet.rb')[/PUPPETVERSION *= *'(.*)'/,1] or fail "Couldn't find PUPPETVERSION"
+end
+
 Dir['tasks/**/*.rake'].each { |t| load t }
 
 FILES = FileList[

data/bin/filebucket

@@ -53,7 +53,7 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet with
 # '--genconfig'.
@@ -91,7 +91,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application'

data/bin/pi

@@ -42,7 +42,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application/pi'

data/bin/puppet

@@ -23,7 +23,7 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet with
 # '--genconfig'.
@@ -64,7 +64,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application/puppet'

data/bin/puppetca

@@ -26,7 +26,7 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/projects/puppet/reference/configref.html for
+# http://puppetlabs.com/projects/puppet/reference/configref.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppetca with
 # '--genconfig'.
@@ -95,7 +95,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application/puppetca'

data/bin/puppetd

@@ -57,7 +57,7 @@
 # parameter, so you can specify '--server <servername>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppetd with
 # '--genconfig'.
@@ -109,8 +109,9 @@
 #   makes sense when used in conjunction with --listen.
 #
 # onetime::
-#   Run the configuration once, rather than as a long-running daemon.  This is
-#   useful for interactively running puppetd.
+#   Run the configuration once. Runs a single daemonized Puppet run. Useful for 
+#   interactively running puppetd and hence used in conjunction with the --no-daemonize 
+#   option.
 #
 # serve::
 #   Start another type of server.  By default, +puppetd+ will start
@@ -152,7 +153,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005, 2006 Reductive Labs, LLC
+# Copyright (c) 2005, 2006 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application/puppetd'

data/bin/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
@@ -16,7 +16,7 @@
 # If mode is not 'rdoc', then this command generates a restructured-text document describing all installed
 # Puppet types or all allowable arguments to puppet executables.  It is largely
 # meant for internal use and is used to generate the reference document
-# available on the Reductive Labs web site.
+# available on the Puppet Labs web site.
 #
 # In 'rdoc' mode, this command generates an html RDoc hierarchy describing the manifests that
 # are in 'manifestdir' and 'modulepath' configuration directives.
@@ -37,7 +37,7 @@
 #   Specifies the directory where to output the rdoc documentation in 'rdoc' mode.
 #
 # mode::
-#   Determine the output mode.  Valid modes are 'text', 'trac', 'pdf', 'markdown' and 'rdoc'. The 'pdf' and 'markdown' modes create PDF or Markdown formatted files in the /tmp directory. Note that 'trac' mode only works on Reductive Labs servers.  The default mode is 'text'.  In 'rdoc' mode you must provide 'manifests-path'
+#   Determine the output mode.  Valid modes are 'text', 'trac', 'pdf', 'markdown' and 'rdoc'. The 'pdf' and 'markdown' modes create PDF or Markdown formatted files in the /tmp directory. Note that 'trac' mode only works on Puppet Labs servers.  The default mode is 'text'.  In 'rdoc' mode you must provide 'manifests-path'
 #
 # reference::
 #   Build a particular reference.  Get a list of references by running +puppetdoc --list+.
@@ -58,7 +58,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005-2007 Reductive Labs, LLC
+# Copyright (c) 2005-2007 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application/puppetdoc'

data/bin/puppetmasterd

@@ -21,7 +21,7 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppetmasterdd with
 # '--genconfig'.
@@ -59,7 +59,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application/puppetmasterd'

data/bin/puppetqd

@@ -19,7 +19,7 @@
 # parameter, so you can specify '--server <servername>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppetd with
 # '--genconfig'.
@@ -46,7 +46,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2009 Reductive Labs, LLC
+# Copyright (c) 2009 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application/puppetqd'

data/bin/puppetrun

@@ -63,7 +63,7 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/projects/puppet/reference/configref.html for
+# http://puppetlabs.com/projects/puppet/reference/configref.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppetmasterdd with
 # '--genconfig'.
@@ -122,7 +122,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application/puppetrun'

data/bin/ralsh

@@ -33,7 +33,7 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet with
 # '--genconfig'.
@@ -82,7 +82,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005-2007 Reductive Labs, LLC
+# Copyright (c) 2005-2007 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'puppet/application/ralsh'

data/conf/epm.list

@@ -1,6 +1,6 @@
 %product Puppet
-%copyright 2004-2005 by Reductive Labs, All Rights Reserved
-%vendor Reductive Labs
+%copyright 2004-2005 by Puppet Labs, All Rights Reserved
+%vendor Puppet Labs
 %license COPYING
 %readme README
 %description System Automation and Configuration Management Software

data/conf/gentoo/puppet/puppet.conf

@@ -1,8 +1,4 @@
 [main]
-    # Where Puppet stores dynamic and growing data.
-    # The default value is '/var/puppet'.
-    vardir = /var/lib/puppet
-
     # The Puppet log directory.
     # The default value is '$vardir/log'.
     logdir = /var/log/puppet

data/conf/osx/PackageInfo.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
     <key>CFBundleIdentifier</key>
-    <string>com.reductivelabs.puppet</string>
+    <string>com.puppetlabs.puppet</string>
     <key>CFBundleShortVersionString</key>
     <string>{SHORTVERSION}</string>
     <key>IFMajorVersion</key>

data/conf/redhat/logrotate

@@ -1,5 +1,6 @@
 /var/log/puppet/*log {
   missingok
+  notifempty
   create 0644 puppet puppet
   sharedscripts
   postrotate

data/conf/redhat/puppet.conf

@@ -1,8 +1,4 @@
 [main]
-    # Where Puppet stores dynamic and growing data.
-    # The default value is '/var/puppet'.
-    vardir = /var/lib/puppet
-
     # The Puppet log directory.
     # The default value is '$vardir/log'.
     logdir = /var/log/puppet

data/conf/redhat/puppet.spec

@@ -1,17 +1,18 @@
 # Augeas and SELinux requirements may be disabled at build time by passing
 # --without augeas and/or --without selinux to rpmbuild or mock
 
-%{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
-%define confdir conf/redhat
+%{!?ruby_sitelibdir: %global ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
+%global confdir conf/redhat
 
 Name:           puppet
-Version:        0.25.2
+Version:        0.25.5
 Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
-URL:            http://puppet.reductivelabs.com/
-Source0:        http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tar.gz
-Patch0:         rundir-perms.patch
+URL:            http://puppetlabs.com
+Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
+Source1:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.sign
+
 Group:          System Environment/Base
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,10 +27,10 @@ Requires:       ruby-shadow
 %endif
 
 # Pull in ruby selinux bindings where available
-%if 0%{?fedora}
-%if 0%{?fedora} >= 12
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 %{!?_without_selinux:Requires: ruby(selinux)}
 %else
+%if 0%{?fedora} || 0%{?rhel} >= 5
 %{!?_without_selinux:Requires: libselinux-ruby}
 %endif
 %endif
@@ -65,7 +66,7 @@ The server can also function as a certificate authority and file server.
 
 %prep
 %setup -q
-%patch0 -p1
+patch -p1 < conf/redhat/rundir-perms.patch
 
 %build
 # Fix some rpmlint complaints
@@ -153,9 +154,9 @@ install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
 %attr(-, puppet, puppet) %{_localstatedir}/run/puppet
 %attr(-, puppet, puppet) %{_localstatedir}/log/puppet
 %attr(-, puppet, puppet) %{_localstatedir}/lib/puppet
+%{_mandir}/man5/puppet.conf.5.gz
 %{_mandir}/man8/pi.8.gz
 %{_mandir}/man8/puppet.8.gz
-%{_mandir}/man8/puppet.conf.8.gz
 %{_mandir}/man8/puppetca.8.gz
 %{_mandir}/man8/puppetd.8.gz
 %{_mandir}/man8/ralsh.8.gz
@@ -220,6 +221,11 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Mon May 03 2010 Todd Zullinger <tmz@pobox.com> - 0.25.5-1
+- Update to 0.25.5
+- Adjust selinux conditional for EL-6
+- Apply rundir-perms patch from tarball rather than including it separately
+
 * 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

data/conf/solaris/pkginfo

@@ -2,6 +2,6 @@ PKG=CSWpuppet
 NAME=puppet - System Automation Framework
 VERSION=0.23.0
 CATEGORY=application
-VENDOR=http://reductivelabs.com/projects/puppet
-HOTLINE=http://reductivelabs.com/cgi-bin/puppet.cgi
+VENDOR=http://puppetlabs.com/projects/puppet
+HOTLINE=http://puppetlabs.com/cgi-bin/puppet.cgi
 EMAIL=luke@madstop.com

data/conf/solaris/smf/puppetd.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 
-<!-- Puppetd Manifest: Luke Kanies - reductivelabs.com -->
+<!-- Puppetd Manifest: Luke Kanies - puppetlabs.com -->
 
 <service_bundle type='manifest' name='puppetd'>
 
@@ -68,8 +68,8 @@
         </common_name>
         <documentation>
             <manpage title='puppetd' section='1' />
-            <doc_link name='reductivelabs.com'
-                uri='http://www.reductivelabs.com/projects/puppet' />
+            <doc_link name='puppetlabs.com'
+                uri='http://www.puppetlabs.com/projects/puppet' />
         </documentation>
     </template>
 </service>

data/conf/solaris/smf/puppetmasterd.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 
-<!-- PuppetMasterd Manifest: Luke Kanies - reductivelabs.com -->
+<!-- PuppetMasterd Manifest: Luke Kanies - puppetlabs.com -->
 
 <service_bundle type='manifest' name='puppetmasterd'>
 
@@ -68,8 +68,8 @@
         </common_name>
         <documentation>
             <manpage title='puppetmasterd' section='1' />
-            <doc_link name='reductivelabs.com'
-                uri='http://www.reductivelabs.com/projects/puppet' />
+            <doc_link name='puppetlabs.com'
+                uri='http://www.puppetlabs.com/projects/puppet' />
         </documentation>
     </template>
 </service>

data/conf/solaris/smf/svc-puppetd

@@ -12,7 +12,7 @@ exec_prefix=/opt/csw
 sysconfdir=/opt/csw/etc
 sbindir=/opt/csw/sbin
 
-pidfile=/var/puppet/run/puppetd.pid
+pidfile=/var/lib/puppet/run/puppetd.pid
 
 case "$1" in
 start)