puppet 3.0.0 → 3.0.1.rc1

data/ext/redhat/server.sysconfig

@@ -5,27 +5,9 @@
 # Specify syslog to send log messages to the system log.
 #PUPPETMASTER_LOG=syslog
 
-# You may specify an alternate port or an array of ports on which
-# puppetmaster should listen. Default is: 8140
-# If you specify more than one port, the puppetmaster ist automatically
-# started with the servertype set to mongrel. This might be interesting
-# if you'd like to run your puppetmaster in a loadbalanced cluster.
-# Please note: this won't setup nor start any loadbalancer.
-# If you'd like to run puppetmaster with mongrel as servertype but only
-# on one (specified) port, you have to add --servertype=mongrel to
-# PUPPETMASTER_EXTRA_OPTS.
-# Default: Empty (Puppetmaster isn't started with mongrel, nor on a
-# specific port)
-#
-# Please note: Due to reduced options in the rc-functions lib in RHEL/Centos
-# versions prior to 5, this feature won't work. Fedora versions >= 8 are
-# known to work.
-#PUPPETMASTER_PORTS=""
-# Puppetmaster on a different port, run with standard webrick servertype
+# You may specify an alternate port on which your puppetmaster should listen. Default is: 8140
+# An example with puppetmaster on a different port, run with standard webrick servertype
 #PUPPETMASTER_PORTS="8141"
-# Example with multiple ports which will start puppetmaster with mongrel
-# as a servertype
-#PUPPETMASTER_PORTS=( 18140 18141 18142 18143 )
 
 # You may specify other parameters to the puppetmaster here
 #PUPPETMASTER_EXTRA_OPTS=--no-ca

data/ext/suse/client.init

@@ -34,10 +34,11 @@
 [ -f /etc/rc.status ] && . /etc/rc.status
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
 lockfile=${LOCKFILE-/var/lock/subsys/puppet}
-pidfile=${PIDFILE-/var/run/puppet.pid}
-puppetd=${PUPPETD-/usr/sbin/puppetd}
+pidfile=${PIDFILE-/var/run/puppet/agent.pid}
+puppetd=${PUPPETD-/usr/bin/puppet}
+RETVAL=0
 
-PUPPET_OPTS=""
+PUPPET_OPTS="agent"
 [ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="--server=${PUPPET_SERVER}"
 [ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"
 [ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --port=${PUPPET_PORT}"
@@ -67,7 +68,7 @@ case "$1" in
 
         # startproc should return 0, even if service is
         # already running to match LSB spec.
-        startproc $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} && touch ${lockfile}
+        startproc -p ${pidfile} $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} && touch ${lockfile}
         # Remember status and be verbose
         rc_status -v
         ;;
@@ -76,7 +77,7 @@ case "$1" in
         ## Stop daemon with killproc(8) and if this fails
         ## set echo the echo return value.
 
-        killproc -QUIT $puppetd && rm -f ${lockfile} ${pidfile}
+        killproc -QUIT -p ${pidfile} $puppetd && rm -f ${lockfile} ${pidfile}
 
         # Remember status and be verbose
         rc_status -v
@@ -105,7 +106,7 @@ case "$1" in
 
         echo -n "Reload service puppet"
         ## if it supports it:
-        killproc -HUP $puppetd
+        killproc -HUP -p ${pidfile} $puppetd
         rc_status -v
         ;;
     reload)
@@ -114,7 +115,7 @@ case "$1" in
 
         # If it supports signalling:
         echo -n "Reload puppet services."
-        killproc -HUP  $puppetd
+        killproc -HUP -p ${pidfile} $puppetd
         rc_status -v
         ;;
     status)
@@ -129,12 +130,12 @@ case "$1" in
         # 3 - service not running
 
         # NOTE: checkproc returns LSB compliant status values.
-        checkproc $puppetd
+        checkproc -p ${pidfile} $puppetd
         rc_status -v
         ;;
     once)
         shift
-        $puppetd -o ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} $@
+        $puppetd ${PUPPET_OPTS} --onetime ${PUPPET_EXTRA_OPTS} $@
         ;;
     *)
         echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|once}"

data/ext/suse/puppet.spec

@@ -5,8 +5,7 @@
 Summary: A network tool for managing many disparate systems
 Name: puppet
 Version: 3.0.0
-Release:        0.1rc4%{?dist}
-#Release: 1%{?dist}
+Release: 1%{?dist}
 License: Apache 2.0
 Group:    Productivity/Networking/System
 
@@ -14,11 +13,11 @@ URL: http://puppetlabs.com/projects/puppet/
 Source0: http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz
 
 PreReq: %{insserv_prereq} %{fillup_prereq}
-Requires: ruby >= 1.8.2
+Requires: ruby >= 1.8.7
 Requires: facter >= 1.6.11
 Requires: cron
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ruby >= 1.8.2
+BuildRequires: ruby >= 1.8.7
 
 %description
 Puppet lets you centrally manage every important aspect of your system using a 
@@ -39,12 +38,11 @@ The server can also function as a certificate authority and file server.
 %setup -q -n %{name}-%{version}
 
 %build
-for f in bin/* sbin/*; do
+for f in bin/*; do
  sed -i -e '1s,^#!.*ruby$,#!/usr/bin/ruby,' $f
 done
 
 %install
-%{__install} -d -m0755 %{buildroot}%{_sbindir}
 %{__install} -d -m0755 %{buildroot}%{_bindir}
 %{__install} -d -m0755 %{buildroot}%{_confdir}
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
@@ -54,34 +52,25 @@ done
 %{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
 %{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
 %{__install} -Dp -m0755 %{pbuild}/bin/* %{buildroot}%{_bindir}
-%{__install} -Dp -m0755 %{pbuild}/sbin/* %{buildroot}%{_sbindir}
 %{__install} -Dp -m0644 %{pbuild}/lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb
 %{__cp} -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir}
 find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -exec chmod a-x '{}' \;
-%{__cp} -a %{pbuild}/conf/redhat/client.sysconfig %{buildroot}%{_confdir}/client.sysconfig
+%{__cp} -a %{pbuild}/ext/redhat/client.sysconfig %{buildroot}%{_confdir}/client.sysconfig
 %{__install} -Dp -m0644 %{buildroot}%{_confdir}/client.sysconfig %{buildroot}/var/adm/fillup-templates/sysconfig.puppet
-%{__cp} -a %{pbuild}/conf/redhat/server.sysconfig %{buildroot}%{_confdir}/server.sysconfig
+%{__cp} -a %{pbuild}/ext/redhat/server.sysconfig %{buildroot}%{_confdir}/server.sysconfig
 %{__install} -Dp -m0644 %{buildroot}%{_confdir}/server.sysconfig %{buildroot}/var/adm/fillup-templates/sysconfig.puppetmaster
-%{__cp} -a %{pbuild}/conf/redhat/fileserver.conf %{buildroot}%{_confdir}/fileserver.conf
+%{__cp} -a %{pbuild}/ext/redhat/fileserver.conf %{buildroot}%{_confdir}/fileserver.conf
 %{__install} -Dp -m0644 %{buildroot}%{_confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
-%{__cp} -a %{pbuild}/conf/redhat/puppet.conf %{buildroot}%{_confdir}/puppet.conf
+%{__cp} -a %{pbuild}/ext/redhat/puppet.conf %{buildroot}%{_confdir}/puppet.conf
 %{__install} -Dp -m0644 %{buildroot}%{_confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
-%{__cp} -a %{pbuild}/conf/redhat/logrotate %{buildroot}%{_confdir}/logrotate
+%{__cp} -a %{pbuild}/ext/redhat/logrotate %{buildroot}%{_confdir}/logrotate
 %{__install} -Dp -m0644 %{buildroot}%{_confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
 %{__install} -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet
 %{__install} -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster
-%{__ln_s}  %{_initrddir}/puppet %{buildroot}%{_sbindir}/rcpuppet
-%{__ln_s}  %{_initrddir}/puppetmaster %{buildroot}%{_sbindir}/rcpuppetmaster
 
 %files
 %defattr(-, root, root, 0755)
 %{_bindir}/puppet
-%{_bindir}/puppetdoc
-%{_bindir}/filebucket
-%{_bindir}/ralsh
-%{_bindir}/pi
-%{_sbindir}/puppetd
-%{_sbindir}/rcpuppet
 %{ruby_sitelibdir}/*
 %{_initrddir}/puppet
 /var/adm/fillup-templates/sysconfig.puppet
@@ -97,11 +86,6 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -exec chmod a-x '{}' \;
 
 %files server
 %defattr(-, root, root, 0755)
-%{_sbindir}/puppetmasterd
-%{_sbindir}/rcpuppetmaster
-%{_sbindir}/puppetqd
-%{_sbindir}/puppetrun
-%{_sbindir}/puppetca
 %{_initrddir}/puppetmaster
 %config(noreplace) %{_sysconfdir}/puppet/*
 %exclude %{_sysconfdir}/puppet/puppet.conf
@@ -137,6 +121,9 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -exec chmod a-x '{}' \;
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Oct 08 2012 Matthaus Owens <matthaus@puppetlabs.com> - 3.0.0-1
+- Update for deprecated binary removal, ruby version requirements
+
 * Fri Aug 24 2012 Eric Sorenson <eric0@puppetlabs.com> - 3.0.0-0.1rc4
 - Update facter version dependency
 - Update for 3.0.0-0.1rc4

data/ext/suse/server.init

@@ -31,7 +31,7 @@
 #      rc_exit          exit appropriate to overall rc status
 
 lockfile=/var/lock/subsys/puppetmaster
-pidfile=/var/run/puppet/puppetmasterd.pid
+pidfile=/var/run/puppet/master.pid
 
 # Source function library.
 [ -f /etc/rc.status ] && . /etc/rc.status
@@ -40,19 +40,28 @@ if [ -f /etc/sysconfig/puppetmaster ]; then
     . /etc/sysconfig/puppetmaster
 fi
 
-PUPPETMASTER_OPTS=""
-[ -n "$PUPPETMASTER_MANIFEST" ] && PUPPETMASTER_OPTS="--manifest=${PUPPETMASTER_MANIFEST}"
-if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
-    PUPPETMASTER_OPTS="$PUPPETMASTER_OPTS --servertype=mongrel"
-elif [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -eq 1 ]; then
-    PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}"
-fi
+PUPPETMASTER_OPTS="master "
+[ -n "$PUPPETMASTER_MANIFEST" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --manifest=${PUPPETMASTER_MANIFEST}"
+[ -n "$PUPPETMASTER_PORTS" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}"
 [ -n "$PUPPETMASTER_LOG" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --logdest ${PUPPETMASTER_LOG}"
 PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} \
     ${PUPPETMASTER_EXTRA_OPTS}"
 
-prog=puppetmasterd
-PUPPETMASTER=/usr/sbin/$prog
+RETVAL=0
+
+PUPPETMASTER=/usr/bin/puppet
+
+mongrel_warning="The mongrel servertype is no longer built-in to Puppet. It appears
+as though mongrel is being used, as the number of ports is greater than
+one. Starting the puppetmaster service will not behave as expected until this
+is resolved. Only the first port has been used in the service. These settings
+are defined at /etc/sysconfig/puppetmaster"
+
+# Warn about removed and unsupported mongrel servertype
+if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
+    echo $mongrel_warning
+    echo
+fi
 
 start() {
     echo -n $"Starting puppetmaster: "
@@ -60,6 +69,7 @@ start() {
     echo
     return $RETVAL
 }
+
 # First reset status of this service
 rc_reset
 
@@ -87,7 +97,7 @@ case "$1" in
         # already running to match LSB spec.
         # Confirm the manifest exists
         if [ -r $PUPPETMASTER_MANIFEST ]; then
-            startproc $PUPPETMASTER $PUPPETMASTER_OPTS && touch "$lockfile"
+            startproc -p ${pidfile} $PUPPETMASTER $PUPPETMASTER_OPTS && touch "$lockfile"
         else
             rc_failed
             echo "Manifest does not exist: $PUPPETMASTER_MANIFEST"
@@ -100,7 +110,7 @@ case "$1" in
         ## Stop daemon with killproc(8) and if this fails
         ## set echo the echo return value.
 
-        killproc -QUIT $PUPPETMASTER && rm -f ${lockfile} ${pidfile}
+        killproc -QUIT -p ${pidfile} $PUPPETMASTER && rm -f ${lockfile} ${pidfile}
 
         # Remember status and be verbose
         rc_status -v
@@ -129,7 +139,7 @@ case "$1" in
 
         echo -n "Reload service puppet"
         ## if it supports it:
-        killproc -HUP $PUPPETMASTER
+        killproc -HUP -p ${pidfile} $PUPPETMASTER
         rc_status -v
         ;;
     reload)
@@ -138,7 +148,7 @@ case "$1" in
 
         # If it supports signalling:
         echo -n "Reload puppet services."
-        killproc -HUP  $PUPPETMASTER
+        killproc -HUP -p ${pidfile} $PUPPETMASTER
         rc_status -v
         ;;
     status)
@@ -153,7 +163,7 @@ case "$1" in
         # 3 - service not running
 
         # NOTE: checkproc returns LSB compliant status values.
-        checkproc $PUPPETMASTER
+        checkproc -p ${pidfile} $PUPPETMASTER
         rc_status -v
         ;;
     *)

data/ext/windows/service/daemon.bat

@@ -3,4 +3,4 @@ SETLOCAL
 
 call "%~dp0..\bin\environment.bat" %0 %*
 
-rubyw "%~dp0daemon.rb" %*
+rubyw -rubygems "%~dp0daemon.rb" %*

data/ext/windows/service/daemon.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'rubygems'
+
 require 'fileutils'
 require 'win32/daemon'
 require 'win32/dir'

data/lib/puppet.rb

@@ -1,11 +1,5 @@
 require 'puppet/version'
 
-# Try to load rubygems.  Hey rubygems, I hate you.
-begin
-  require 'rubygems'
-rescue LoadError
-end
-
 # see the bottom of the file for further inclusions
 require 'facter'
 require 'puppet/error'

data/lib/puppet/application/agent.rb

@@ -1,4 +1,5 @@
 require 'puppet/application'
+require 'puppet/run'
 
 class Puppet::Application::Agent < Puppet::Application
 

data/lib/puppet/defaults.rb

@@ -1375,12 +1375,6 @@ EOT
 
         define_settings(
         :ldap,
-    :ldapnodes => {
-      :default  => false,
-      :type     => :boolean,
-      :desc     => "Whether to search for node configurations in LDAP.  See
-      http://projects.puppetlabs.com/projects/puppet/wiki/LDAP_Nodes for more information.",
-    },
     :ldapssl => {
       :default  => false,
       :type   => :boolean,
@@ -1397,11 +1391,11 @@ EOT
     },
     :ldapserver => {
       :default  => "ldap",
-      :desc     => "The LDAP server.  Only used if `ldapnodes` is enabled.",
+      :desc     => "The LDAP server.  Only used if `node_terminus` is set to `ldap`.",
     },
     :ldapport => {
       :default  => 389,
-      :desc     => "The LDAP port.  Only used if `ldapnodes` is enabled.",
+      :desc     => "The LDAP port.  Only used if `node_terminus` is set to `ldap`.",
     },
 
     :ldapstring => {
@@ -1471,7 +1465,6 @@ You can adjust the backend using the storeconfigs_backend setting.",
             Puppet.settings[:catalog_cache_terminus] = :store_configs
           end
           Puppet::Node::Facts.indirection.cache_class = :store_configs
-          Puppet::Node.indirection.cache_class = :store_configs
 
           Puppet::Resource.indirection.terminus_class = :store_configs
         end

data/lib/puppet/feature/eventlog.rb

@@ -1,6 +1,5 @@
 require 'puppet/util/feature'
 
 if Puppet.features.microsoft_windows?
-  Puppet.features.rubygems?
   Puppet.features.add(:eventlog, :libs => %{win32/eventlog})
 end

data/lib/puppet/feature/rack.rb

@@ -3,12 +3,7 @@ require 'puppet/util/feature'
 # See if we have rack available, an HTTP Application Stack
 # Explicitly depend on rack library version >= 1.0.0
 Puppet.features.add(:rack) do
-  begin
-    require 'rack'
-  rescue LoadError => detail
-    require 'rubygems'
-    require 'rack'
-  end
+  require 'rack'
 
   if ! (defined?(::Rack) and defined?(::Rack.release))
     false

data/lib/puppet/feature/rails.rb

@@ -1,7 +1,5 @@
 require 'puppet/util/feature'
 
-Puppet.features.rubygems?
-
 Puppet.features.add(:rails) do
   begin
     # Turn off the constant watching parts of ActiveSupport, which have a huge

data/lib/puppet/feature/rubygems.rb

@@ -1,3 +1,7 @@
 require 'puppet/util/feature'
 
-Puppet.features.add(:rubygems, :libs => "rubygems")
+Puppet.features.add(:rubygems) do
+  Puppet.deprecation_warning "Puppet.features.rubygems? is deprecated. Require rubygems in your application's entry point if you need it."
+
+  require 'rubygems'
+end

data/lib/puppet/feature/ssh.rb

@@ -1,4 +1,3 @@
 require 'puppet/util/feature'
 
-Puppet.features.rubygems?
 Puppet.features.add(:ssh, :libs => %{net/ssh})

data/lib/puppet/feature/stomp.rb

@@ -2,5 +2,4 @@ require 'puppet/util/feature'
 
 # We want this to load if possible, but it's not automatically
 # required.
-Puppet.features.rubygems?
 Puppet.features.add(:stomp, :libs => %{stomp})

data/lib/puppet/feature/zlib.rb

@@ -2,5 +2,4 @@ require 'puppet/util/feature'
 
 # We want this to load if possible, but it's not automatically
 # required.
-Puppet.features.rubygems?
 Puppet.features.add(:zlib, :libs => %{zlib})

data/lib/puppet/network/http/rack/rest.rb

@@ -82,7 +82,10 @@ class Puppet::Network::HTTP::RackREST < Puppet::Network::HTTP::RackHttpHandler
   def client_cert(request)
     # This environment variable is set by mod_ssl, note that it
     # requires the `+ExportCertData` option in the `SSLOptions` directive
-    return nil unless cert = request.env['SSL_CLIENT_CERT']
+    cert = request.env['SSL_CLIENT_CERT']
+    # NOTE: The SSL_CLIENT_CERT environment variable will be the empty string
+    # when Puppet agent nodes have not yet obtained a signed certificate.
+    return nil if cert.nil? or cert.empty?
     OpenSSL::X509::Certificate.new(cert)
   end
 

data/lib/puppet/rails/inventory_node.rb

@@ -4,23 +4,36 @@ class Puppet::Rails::InventoryNode < ::ActiveRecord::Base
   has_many :facts, :class_name => "Puppet::Rails::InventoryFact", :foreign_key => :node_id, :dependent => :delete_all
 
   if Puppet::Util.activerecord_version < 3.0
-    # For backward compatibility, add the newer name to older implementations.
-    ActiveRecord::NamedScope::ClassMethods.module_eval { alias :scope :named_scope }
-  end
+    # For backward compatibility, use the old named_scope with pre 3.0 activerecord
+    named_scope :has_fact_with_value, lambda { |name,value|
+      {
+        :conditions => ["inventory_facts.name = ? AND inventory_facts.value = ?", name, value.to_s],
+        :joins => :facts
+      }
+    }
 
-  scope :has_fact_with_value, lambda { |name,value|
-    {
-      :conditions => ["inventory_facts.name = ? AND inventory_facts.value = ?", name, value.to_s],
-      :joins => :facts
+    named_scope :has_fact_without_value, lambda { |name,value|
+      {
+        :conditions => ["inventory_facts.name = ? AND inventory_facts.value != ?", name, value.to_s],
+        :joins => :facts
+      }
+    }
+  else
+    # Use scope for activerecord >= 3.0
+    scope :has_fact_with_value, lambda { |name,value|
+      {
+        :conditions => ["inventory_facts.name = ? AND inventory_facts.value = ?", name, value.to_s],
+        :joins => :facts
+      }
     }
-  }
 
-  scope :has_fact_without_value, lambda { |name,value|
-    {
-      :conditions => ["inventory_facts.name = ? AND inventory_facts.value != ?", name, value.to_s],
-      :joins => :facts
+    scope :has_fact_without_value, lambda { |name,value|
+      {
+        :conditions => ["inventory_facts.name = ? AND inventory_facts.value != ?", name, value.to_s],
+        :joins => :facts
+      }
     }
-  }
+  end
 
   def facts_to_hash
     facts.inject({}) do |fact_hash,fact|