puppet 2.7.26 → 3.0.0.rc4

data/bin/puppet

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 
-# For security reasons, ensure that '.' is not on the load path
-# This is primarily for 1.8.7 since 1.9.2+ doesn't put '.' on the load path
-$LOAD_PATH.delete '.'
+# Load rubygems so we can require gems
+begin
+  require 'rubygems'
+rescue LoadError
+end
 
 require 'puppet/util/command_line'
 Puppet::Util::CommandLine.new.execute

data/conf/auth.conf

@@ -63,10 +63,10 @@ path /certificate_revocation_list/ca
 method find
 allow *
 
-# allow all nodes to store their own reports
-path ~ ^/report/([^/]+)$
+# allow all nodes to store their reports
+path /report
 method save
-allow $1
+allow *
 
 # inconditionnally allow access to all files services
 # which means in practice that fileserver.conf will

data/conf/osx/preflight

@@ -0,0 +1,24 @@
+#!/bin/bash
+#
+# Make sure that old puppet cruft is removed
+# This also allows us to downgrade puppet as
+# it's more likely that installing old versions
+# over new will cause issues.
+#
+# ${3} is the destination volume so that this works correctly
+# when being installed to volumes other than the current OS.
+
+/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"
+/bin/rm -Rf "${3}{BINDIR}/puppetd"
+/bin/rm -Rf "${3}{BINDIR}/puppetmasterd"
+/bin/rm -Rf "${3}{BINDIR}/puppetqd"
+/bin/rm -Rf "${3}{BINDIR}/puppetrun"

data/conf/redhat/client.init

@@ -16,14 +16,14 @@ export PATH
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
 lockfile=${LOCKFILE-/var/lock/subsys/puppet}
 pidfile=${PIDFILE-/var/run/puppet/agent.pid}
-puppetd=${PUPPETD-/usr/sbin/puppetd}
+puppetd=${PUPPETD-/usr/bin/puppet}
 RETVAL=0
 
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-PUPPET_OPTS=""
-[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="--server=${PUPPET_SERVER}"
+PUPPET_OPTS="agent "
+[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="${PUPPET_OPTS} --server=${PUPPET_SERVER}"
 [ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"
 [ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --masterport=${PUPPET_PORT}"
 
@@ -40,7 +40,7 @@ fi
 ##[ -n "$INIT_VERSION" ] && PUPPET_OPTS="${PUPPET_OPTS} --fullrun"
 
 start() {
-    echo -n $"Starting puppet: "
+    echo -n $"Starting puppet agent: "
     daemon $daemonopts $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS}
     RETVAL=$?
     echo
@@ -49,7 +49,7 @@ start() {
 }
 
 stop() {
-    echo -n $"Stopping puppet: "
+    echo -n $"Stopping puppet agent: "
     killproc $pidopts $puppetd
     RETVAL=$?
     echo
@@ -57,7 +57,7 @@ stop() {
 }
 
 reload() {
-    echo -n $"Restarting puppet: "
+    echo -n $"Restarting puppet agent: "
     killproc $pidopts $puppetd -HUP
     RETVAL=$?
     echo
@@ -80,7 +80,7 @@ rh_status_q() {
 }
 
 genconfig() {
-    echo -n $"Generate configuration puppet: "
+    echo -n $"Generate puppet agent configuration: "
     $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
 }
 
@@ -106,7 +106,7 @@ case "$1" in
     ;;
     once)
         shift
-        $puppetd -o ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} $@
+        $puppetd ${PUPPET_OPTS} --onetime ${PUPPET_EXTRA_OPTS} $@
         ;;
     genconfig)
         genconfig

data/{ext/redhat/puppet.spec.erb → conf/redhat/puppet.spec}

@@ -9,26 +9,26 @@
 %global puppet_libdir   %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]')
 %endif
 
-# VERSION is subbed out during rake srpm process
-# %global realversion <%= @version %>
-# %global rpmversion <%= @rpmversion %>
-
 %global confdir conf/redhat
 
 Name:           puppet
-Version:        %{rpmversion}
-Release:        <%= @rpmrelease -%>%{?dist}
+Version:        3.0.0
+Release:        0.1rc4%{?dist}
+#Release:        1%{?dist}
 Vendor:         %{?_host_vendor}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
 URL:            http://puppetlabs.com
-Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{realversion}.tar.gz
+Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
+#Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc3.tar.gz
+Source1:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.asc
+#Source1:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc3.tar.gz.asc
 
 Group:          System Environment/Base
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  facter < 1:2.0
+BuildRequires:  facter >= 1.6
 BuildRequires:  ruby >= 1.8.5
 
 BuildArch:      noarch
@@ -44,8 +44,10 @@ Requires:       ruby-shadow
 %endif
 %endif
 
-Requires:       facter >= 1.5, facter < 1:2.0
+Requires:       facter >= 1.6.11
 Requires:       ruby >= 1.8.5
+Requires:       hiera >= 1.0.0
+Requires:       hiera-puppet >= 1.0.0
 %{!?_without_augeas:Requires: ruby-augeas}
 
 Requires(pre):  shadow-utils
@@ -74,7 +76,8 @@ Provides the central puppet server daemon which provides manifests to clients.
 The server can also function as a certificate authority and file server.
 
 %prep
-%setup -q -n %{name}-%{realversion}
+%setup -q -n %{name}-%{version}
+#%setup -q -n %{name}-%{version}rc3
 patch -s -p1 < conf/redhat/rundir-perms.patch
 
 
@@ -85,7 +88,7 @@ for f in mac_dscl.pp mac_dscl_revert.pp \
   sed -i -e'1d' examples/$f
   chmod a-x examples/$f
 done
-for f in external/nagios.rb network/http_server/mongrel.rb relationship.rb; do
+for f in external/nagios.rb relationship.rb; do
   sed -i -e '1d' lib/puppet/$f
 done
 #chmod +x ext/puppetstoredconfigclean.rb
@@ -109,24 +112,16 @@ install -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/syscon
 install -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet
 install -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster
 install -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster
+install -Dp -m0755 %{confdir}/queue.init %{buildroot}%{_initrddir}/puppetqueue
 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 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
 
-# We need something for these ghosted files, otherwise rpmbuild
-# will complain loudly. They won't be included in the binary packages
-touch %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf
-touch %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
-touch %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
-
 # Install the ext/ directory to %%{_datadir}/%%{name}
 install -d %{buildroot}%{_datadir}/%{name}
 cp -a ext/ %{buildroot}%{_datadir}/%{name}
 # emacs and vim bits are installed elsewhere
 rm -rf %{buildroot}%{_datadir}/%{name}/ext/{emacs,vim}
-# remove misc packaging files we shouldn't ship with the rpm
-rm -rf %{buildroot}%{_datadir}/%{name}/ext/{debian,osx}
-rm -rf %{buildroot}%{_datadir}/%{name}/ext/{build_defaults.yaml,project_data.yaml}
 
 # Install emacs mode files
 emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp
@@ -152,13 +147,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules
 %files
 %defattr(-, root, root, 0755)
 %doc CHANGELOG LICENSE README.md examples
-%{_bindir}/pi
 %{_bindir}/puppet
-%{_bindir}/ralsh
-%{_bindir}/filebucket
-%{_bindir}/puppetdoc
-%{_sbindir}/puppetca
-%{_sbindir}/puppetd
 %{puppet_libdir}/*
 %{_initrddir}/puppet
 %dir %{_sysconfdir}/puppet
@@ -169,8 +158,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules
 %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
 # We don't want to require emacs or vim, so we need to own these dirs
 %{_datadir}/emacs
@@ -182,12 +169,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules
 %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/puppetca.8.gz
-%{_mandir}/man8/puppetd.8.gz
-%{_mandir}/man8/ralsh.8.gz
-%{_mandir}/man8/puppetdoc.8.gz
 %{_mandir}/man8/puppet-agent.8.gz
 %{_mandir}/man8/puppet-apply.8.gz
 %{_mandir}/man8/puppet-catalog.8.gz
@@ -224,18 +206,12 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules
 
 %files server
 %defattr(-, root, root, 0755)
-%{_sbindir}/puppetmasterd
-%{_sbindir}/puppetrun
-%{_sbindir}/puppetqd
 %{_initrddir}/puppetmaster
+%{_initrddir}/puppetqueue
 %config(noreplace) %{_sysconfdir}/puppet/fileserver.conf
 %dir %{_sysconfdir}/puppet/manifests
 %config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster
-%ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetmasterd.conf
-%{_mandir}/man8/filebucket.8.gz
-%{_mandir}/man8/puppetmasterd.8.gz
-%{_mandir}/man8/puppetrun.8.gz
-%{_mandir}/man8/puppetqd.8.gz
+%{_mandir}/man8/puppet-ca.8.gz
 %{_mandir}/man8/puppet-master.8.gz
 
 # Fixed uid/gid were assigned in bz 472073 (Fedora), 471918 (RHEL-5),
@@ -303,11 +279,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
-* <%= Time.now.strftime("%a %b %d %Y") %> Puppet Labs Release <info@puppetlabs.com> -  <%= @rpmversion %>-<%= @rpmrelease %>
-- Build for <%= @version %>
-
-* Tue Oct 30 2012 Michael Stahnke <stahnma@puppetlabs.com> - 2.7.19-1.0
-- Remove the asc file as a source since it was never used
+* Fri Aug 24 2012 Eric Sorenson <eric0@puppetlabs.com> - 3.0.0-0.1rc4
+- Facter requirement is 1.6.11, not 2.0
+- Update for 3.0.0 rc4
 
 * Tue Aug 21 2012 Moses Mendoza <moses@puppetlabs.com> - 2.7.19-1
 - Update for 2.7.19
@@ -339,12 +313,21 @@ rm -rf %{buildroot}
 * Wed Jun 06 2012 Matthaus Litteken <matthaus@puppetlabs.com> - 2.7.16-0.1rc1
 - Update for 2.7.16rc1, added generated manpages
 
+* Fri Jun 01 2012 Matthaus Litteken <matthaus@puppetlabs.com> - 3.0.0-0.1rc3
+- Puppet 3.0.0rc3 Release
+
 * Fri Jun 01 2012 Matthaus Litteken <matthaus@puppetlabs.com> - 2.7.15-0.1rc4
 - Update for 2.7.15rc4
 
 * Tue May 29 2012 Moses Mendoza <moses@puppetlabs.com> - 2.7.15-0.1rc3
 - Update for 2.7.15rc3
 
+* Tue May 22 2012 Matthaus Litteken <matthaus@puppetlabs.com> - 3.0.0-0.1rc2
+- Puppet 3.0.0rc2 Release
+
+* Thu May 17 2012 Matthaus Litteken <matthaus@puppetlabs.com> - 3.0.0-0.1rc1
+- Puppet 3.0.0rc1 Release
+
 * Wed May 16 2012 Moses Mendoza <moses@puppetlabs.com> - 2.7.15-0.1rc2
 - Update for 2.7.15rc2
 

data/conf/redhat/queue.init

@@ -0,0 +1,105 @@
+#!/bin/bash
+# puppetqueue   Init script for running the puppet queue daemon
+#
+# chkconfig: - 65 45
+#
+# description: Processes entities in a queue as they are recieved.
+# processname: puppetqd
+# config: /etc/sysconfig/puppetqueue
+
+PATH=/usr/bin:/sbin:/bin:/usr/sbin
+export PATH
+
+[ -f /etc/sysconfig/puppetqueue ] && . /etc/sysconfig/puppetqueue
+lockfile=${LOCKFILE-/var/lock/subsys/puppetqd}
+pidfile=${PIDFILE-/var/run/puppet/queue.pid}
+puppetqd=${PUPPETQD-/usr/bin/puppet}
+RETVAL=0
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+PUPPET_OPTS="queue "
+[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="${PUPPET_OPTS} --server=${PUPPET_SERVER}"
+
+# Determine if we can use the -p option to daemon, killproc, and status.
+# RHEL < 5 can't.
+if status | grep -q -- '-p' 2>/dev/null; then
+    daemonopts="--pidfile $pidfile"
+    pidopts="-p $pidfile"
+fi
+
+start() {
+    echo -n $"Starting puppet queue: "
+    daemon $daemonopts $puppetqd ${PUPPET_OPTS}
+    RETVAL=$?
+    echo
+        [ $RETVAL = 0 ] && touch ${lockfile}
+        return $RETVAL
+}
+
+stop() {
+    echo -n $"Stopping puppet queue: "
+    killproc $pidopts $puppetqd
+    RETVAL=$?
+    echo
+    [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
+}
+
+reload() {
+    echo -n $"Restarting puppet queue: "
+    killproc $pidopts $puppetqd -HUP
+    RETVAL=$?
+    echo
+    return $RETVAL
+}
+
+restart() {
+    stop
+    start
+}
+
+rh_status() {
+    status $pidopts $puppetqd
+    RETVAL=$?
+    return $RETVAL
+}
+
+rh_status_q() {
+    rh_status >/dev/null 2>&1
+}
+
+genconfig() {
+    echo -n $"Generate puppet queue configuration: "
+    $puppetqd ${PUPPET_OPTS} --genconfig
+}
+
+case "$1" in
+    start)
+        start
+    ;;
+    stop)
+        stop
+    ;;
+    restart)
+        restart
+    ;;
+    reload|force-reload)
+        reload
+    ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+    ;;
+    status)
+        rh_status
+    ;;
+    genconfig)
+        genconfig
+    ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|genconfig}"
+        exit 1
+esac
+
+exit $RETVAL

data/conf/redhat/rundir-perms.patch

@@ -1,7 +1,7 @@
-From b153b4d234cd015efb52a5db8075350a75506668 Mon Sep 17 00:00:00 2001
-From: Jeroen van Meeuwen (Fedora Unity) <kanarip@fedoraunity.org>
-Date: Sat, 10 Jul 2010 14:44:04 -0400
-Subject: [PATCH/puppet] Tighten rundir perms (rhbz #495096)
+From c181799a30427966cbe028fde7b390cac9cf44e9 Mon Sep 17 00:00:00 2001
+From: Matthaus Litteken <matthaus@puppetlabs.com>
+Date: Fri, 4 May 2012 10:59:26 -0700
+Subject: [PATCH] Tighten rundir perms (rhbz #495096)
 
 The loose default permissions are not required for Red Hat systems
 installed via rpm packages because the packages create the required
@@ -11,18 +11,18 @@ service user/group.
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
-index 0af40f2..71027d6 100644
+index dc498e7..eef36d2 100644
 --- a/lib/puppet/defaults.rb
 +++ b/lib/puppet/defaults.rb
-@@ -26,7 +26,7 @@ module Puppet
-     },
+@@ -84,7 +84,7 @@ module Puppet
      :rundir => {
-       :default => Puppet.run_mode.run_dir,
--      :mode => 01777,
-+      :mode => 0755,
-       :desc => "Where Puppet PID files are kept."
+       :default  => nil,
+       :type     => :directory,
+-      :mode     => 01777,
++      :mode     => 0755,
+       :desc     => "Where Puppet PID files are kept."
      },
-     :genconfig => [false,
+     :genconfig => {
 -- 
-1.7.1
+1.7.7.6
 

data/conf/redhat/server.init

@@ -22,10 +22,10 @@ if [ -f /etc/sysconfig/puppetmaster ]; then
     . /etc/sysconfig/puppetmaster
 fi
 
-PUPPETMASTER_OPTS=""
-[ -n "$PUPPETMASTER_MANIFEST" ] && PUPPETMASTER_OPTS="--manifest=${PUPPETMASTER_MANIFEST}"
+PUPPETMASTER_OPTS="master "
+[ -n "$PUPPETMASTER_MANIFEST" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --manifest=${PUPPETMASTER_MANIFEST}"
 if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
-    PUPPETMASTER_OPTS="$PUPPETMASTER_OPTS --servertype=mongrel"
+    PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --servertype=mongrel"
 elif [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -eq 1 ]; then
     PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}"
 fi
@@ -43,7 +43,7 @@ fi
 RETVAL=0
 
 prog=puppetmasterd
-PUPPETMASTER=/usr/sbin/$prog
+PUPPETMASTER=/usr/bin/puppet
 
 start() {
     echo -n $"Starting puppetmaster: "