puppet 0.23.0 → 0.23.1

data/CHANGELOG

@@ -1,3 +1,61 @@
+    You can now specify relationships to classes, which work
+    exactly like relationships to defined types:
+        require => Class[myclass]
+    This works with qualified classes, too.
+
+    You can now do simple queries in a collection of
+    exported resources.  You still cannot do multi-condition queries,
+    though. (#703)
+
+    puppetca now exits with a non-zero code if it cannot
+    find any host certificates to clean. (Patch by Dean
+    Wilson.)
+
+    Fully-qualified resources can now have defaults. (#589)
+
+    Resource references can now be fully-qualified names,
+    meaning you can list definitions with a namespace as
+    dependencies.  (#468)
+
+    Files modified using a FileType instance, as ParsedFile
+    does, will now automatically get backed up to the filebucket
+    named "puppet".
+
+    Added a 'maillist' type for managing mailing lists.
+
+    Added a 'mailalias' type for managing mail aliases.
+
+    Added patch by Valentin Vidic that adds the '+>' syntax to
+    resources, so parameter values can be added to.
+
+    The configuration client now pulls libraries down to $libdir,
+    and all autoloading is done from there with full support
+    for any reloadable file, such as types and providers. (#621)
+    Note that this is not backward compatible -- if you're using
+    pluginsync right now, you'll need to disable it on your clients
+    until you can upgrade them.
+
+    The Rails log level can now be set via (shockingly!) the
+    'rails_loglevel' parameter (#710).  Note that this isn't
+    exactly the feature asked for, but I could not find a
+    way to directly copy ActiveRecord's concept of an environment.
+
+    External node sources can now return undefined classes (#687). 
+
+    Puppet clients now have http proxy support (#701).
+
+    The parser now throws an error when a resource reference
+    is created for an unknown type.  Also, resource references
+    look up defined types and translate their type accordingly. (#706)
+
+    Hostnames can now be double quoted.
+
+    Adding module autoloading (#596) -- you can now 'include' classes
+    from modules without ever needing to specifically load them.
+
+    Class names and node names now conflict (#620).
+
+0.23.0
     Modified the fileserver to cache file information, so that
     each file isn't being read on every connection.  Also,
     added londo's patch from #678 to avoid reading entire files

data/Rakefile

@@ -138,4 +138,4 @@ task :dailyclean do
     end
 end
 
-# $Id: Rakefile 2630 2007-06-19 23:11:10Z luke $
+# $Id: Rakefile 2635 2007-06-19 23:44:20Z luke $

data/bin/filebucket

@@ -7,7 +7,7 @@
 #
 # = Usage
 #
-#   pbucket [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
+#   filebucket [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
 #      [-l|--local] [-r|--remote]
 #      [-s|--server <server>] [-b|--bucket <directory>] <file> <file> ...
 #
@@ -34,16 +34,16 @@
 #   to this argument; you are not restricted to restoring the content to its
 #   original location.
 #
-# Note that +pbucket+ defaults to using a network-based filebucket available on
+# Note that +filebucket+ defaults to using a network-based filebucket available on
 # the server named +puppet+.  To use this, you'll have to be running as a user
 # with valid Puppet certificates.  Alternatively, you can use your local file bucket
 # by specifying +--local+.
 #
 # = Example
 #
-#   $ pbucket backup /etc/passwd
+#   $ filebucket backup /etc/passwd
 #   /etc/passwd: 429b225650b912a2ee067b0a4cf1e949
-#   $ pbucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949
+#   $ filebucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949
 #   $
 # 
 # = Options
@@ -83,7 +83,7 @@
 #
 # = Example
 #
-#   pbucket -b /tmp/filebucket /my/file
+#   filebucket -b /tmp/filebucket /my/file
 #
 # = Author
 #
@@ -209,4 +209,4 @@ else
     raise "Invalid mode %s" % mode
 end
 
-# $Id: filebucket 2464 2007-05-06 05:42:53Z luke $
+# $Id: filebucket 2704 2007-07-18 16:41:15Z luke $

data/bin/puppetca

@@ -195,8 +195,18 @@ when :clean
         $stderr.puts "You must specify one or more hosts to clean"
         exit(24)
     end
+    cleaned = false
     hosts.each do |host|
+        cert = ca.getclientcert(host)[0]
+        if cert.nil?
+            $stderr.puts "Could not find client certificate for %s" % host
+            next
+        end
         ca.clean(host)
+        cleaned = true
+    end
+    unless cleaned
+        exit(27)
     end
 when :sign
     unless to_sign.length > 0 or all
@@ -276,4 +286,4 @@ else
     exit(42)
 end
 
-# $Id: puppetca 2464 2007-05-06 05:42:53Z luke $
+# $Id: puppetca 2702 2007-07-17 14:00:29Z luke $

data/bin/puppetmasterd

@@ -242,21 +242,22 @@ if fs.include?(:Config)
     handlers[:FileServer] = fs
 end
 
+webserver = server = nil
 begin
     case Puppet[:servertype]
     when "webrick"
         # use the default, um, everything
         require 'puppet/network/server/webrick'
-        server = Puppet::Network::Server::WEBrick.new(:Handlers => handlers)
+        webserver = server = Puppet::Network::Server::WEBrick.new(:Handlers => handlers)
     when "mongrel":
         require 'puppet/network/server/mongrel'
-        handler = Puppet::Network::Server::Mongrel.new(handlers)
+        server = Puppet::Network::Server::Mongrel.new(handlers)
         addr = Puppet[:bindaddress]
         if addr == ""
             addr =  "127.0.0.1"
         end
-        server = Mongrel::HttpServer.new(addr, Puppet[:masterport])
-        server.register("/", handler)
+        webserver = Mongrel::HttpServer.new(addr, Puppet[:masterport])
+        webserver.register("/", server)
     else
         Puppet.err "Invalid server type %s" % Puppet[:servertype]
         exit(45)
@@ -296,7 +297,7 @@ case Puppet[:servertype]
 when "webrick"
     Puppet.start
 when "mongrel":
-    server.run.join
+    webserver.run.join
 end
 
-# $Id: puppetmasterd 2594 2007-06-15 23:11:43Z luke $
+# $Id: puppetmasterd 2659 2007-07-08 23:02:06Z luke $

data/conf/redhat/client.init

@@ -80,6 +80,7 @@ case "$1" in
 	;;
   status)
         status $puppetd
+        RETVAL=$?
 	;;
   once)
         shift

data/conf/redhat/{puppetd.conf → puppet.conf}

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

data/conf/redhat/puppet.spec

@@ -7,7 +7,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.23.0
+Version: 0.23.1
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -43,6 +43,8 @@ The server can also function as a certificate authority and file server.
 
 %prep
 %setup -q
+cp -p conf/redhat/puppetd.conf conf/redhat/puppet.conf
+sed -i -e 's/^\[puppet\]$/[main]/' conf/redhat/puppet.conf
 
 %build
 for f in bin/* ; do 
@@ -50,32 +52,33 @@ for f in bin/* ; do
 done
 
 %install
-%{__rm} -rf %{buildroot}
-%{__install} -d -m0755 %{buildroot}%{_sbindir}
-%{__install} -d -m0755 %{buildroot}%{_bindir}
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
-%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
-%{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
-%{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
-%{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
-%{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
-%{__install} -Dp -m0755 %{pbuild}/bin/* %{buildroot}%{_sbindir}
-%{__mv} %{buildroot}%{_sbindir}/puppet %{buildroot}%{_bindir}/puppet
-%{__mv} %{buildroot}%{_sbindir}/ralsh %{buildroot}%{_bindir}/ralsh
-%{__mv} %{buildroot}%{_sbindir}/filebucket %{buildroot}%{_bindir}/filebucket
-%{__mv} %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun
-%{__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 -print0 | xargs -0 -r %{__chmod} a-x
-%{__install} -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet
-%{__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 -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
-%{__install} -Dp -m0644 %{confdir}/puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
-%{__ln_s} puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf
-%{__ln_s} puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
-%{__install} -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
+rm -rf %{buildroot}
+install -d -m0755 %{buildroot}%{_sbindir}
+install -d -m0755 %{buildroot}%{_bindir}
+install -d -m0755 %{buildroot}%{ruby_sitelibdir}
+install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
+install -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
+install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
+install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
+install -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
+install -Dp -m0755 %{pbuild}/bin/* %{buildroot}%{_sbindir}
+mv %{buildroot}%{_sbindir}/puppet %{buildroot}%{_bindir}/puppet
+mv %{buildroot}%{_sbindir}/ralsh %{buildroot}%{_bindir}/ralsh
+mv %{buildroot}%{_sbindir}/filebucket %{buildroot}%{_bindir}/filebucket
+mv %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun
+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 -print0 | xargs -0 -r chmod a-x
+install -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet
+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 -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
+install -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
+ln -s puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf
+ln -s puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
+install -Dp -m0644 %{confdir}/puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
+install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
 
 %files
 %defattr(-, root, root, 0755)
@@ -87,8 +90,9 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %
 %{_initrddir}/puppet
 %dir %{_sysconfdir}/puppet
 %config(noreplace) %{_sysconfdir}/sysconfig/puppet
-%config(noreplace) %{_sysconfdir}/puppet/puppetd.conf
-%doc CHANGELOG COPYING LICENSE README TODO examples
+%config(noreplace) %{_sysconfdir}/puppet/puppet.conf
+%ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf
+%doc CHANGELOG COPYING LICENSE README examples
 %exclude %{_sbindir}/puppetdoc
 %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
 # These need to be owned by puppet so the server can
@@ -102,8 +106,11 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %
 %{_sbindir}/puppetmasterd
 %{_bindir}/puppetrun
 %{_initrddir}/puppetmaster
-%config(noreplace) %{_sysconfdir}/puppet/*
+%config(noreplace) %{_sysconfdir}/puppet/fileserver.conf
+%dir %{_sysconfdir}/puppet/manifests
 %config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster
+%ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetca.conf
+%ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetmasterd.conf
 %{_sbindir}/puppetca
 
 %pre
@@ -138,9 +145,14 @@ if [ "$1" -ge 1 ]; then
 fi
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %changelog
+* Wed Jun 20 2007 David Lutterkort <dlutter@redhat.com> - 0.23.0-1
+- Install one puppet.conf instead of old config files, keep old configs 
+  around to ease update
+- Use plain shell commands in install instead of macros
+
 * Wed May  2 2007 David Lutterkort <dlutter@redhat.com> - 0.22.4-1
 - New version
 

data/conf/redhat/server.init

@@ -78,6 +78,7 @@ case "$1" in
 	;;
   status)
 	status $PUPPETMASTER
+        RETVAL=$?
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"

data/lib/puppet.rb

@@ -25,7 +25,7 @@ require 'puppet/util/suidmanager'
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-    PUPPETVERSION = '0.23.0'
+    PUPPETVERSION = '0.23.1'
 
     def Puppet.version
         return PUPPETVERSION
@@ -421,11 +421,11 @@ module Puppet
 end
 
 require 'puppet/type'
-require 'puppet/modules'
+require 'puppet/module'
 require 'puppet/util/storage'
 require 'puppet/parser/interpreter'
 if Puppet[:storeconfigs]
     require 'puppet/rails'
 end
 
-# $Id: puppet.rb 2631 2007-06-19 23:12:23Z luke $
+# $Id: puppet.rb 2724 2007-07-20 19:23:33Z luke $

data/lib/puppet/configuration.rb

@@ -339,6 +339,11 @@ module Puppet
             :mode => 0640,
             :desc => "Where the puppetd web server logs."
         },
+        :http_proxy_host => ["none",
+            "The HTTP proxy host to use for outgoing connections.  Note: You
+            may need to use a FQDN for the server hostname when using a proxy."],
+        :http_proxy_port => [3128,
+            "The HTTP proxy port to use for outgoing connections"],
         :server => ["puppet",
             "The server to which server puppetd should connect"],
         :ignoreschedules => [false,
@@ -431,8 +436,10 @@ module Puppet
     self.setdefaults(:main,
         :pluginpath => ["$vardir/plugins",
             "Where Puppet should look for plugins.  Multiple directories should
-            be colon-separated, like normal PATH variables."],
-        :plugindest => ["$vardir/plugins",
+            be colon-separated, like normal PATH variables.  As of 0.23.1, this
+            option is deprecated; download your custom libraries to the $libdir
+            instead."],
+        :plugindest => ["$libdir",
             "Where Puppet should store plugins that it pulls down from the central
             server."],
         :pluginsource => ["puppet://$server/plugins",
@@ -506,7 +513,10 @@ module Puppet
             :owner => "$user",
             :group => "$group",
             :desc => "Where Rails-specific logs are sent"
-        }
+        },
+        :rails_loglevel => ["info", "The log level for Rails connections.  The value must be
+            a valid log level within Rails.  Production environments normally use ``info``
+            and other environments normally use ``debug``."]
     )
 
     setdefaults(:graphing,
@@ -550,7 +560,8 @@ module Puppet
 
     setdefaults(:ldap,
         :ldapnodes => [false,
-            "Whether to search for node configurations in LDAP."],
+            "Whether to search for node configurations in LDAP.  See
+            `LdapNodes`:trac: for more information."],
         :ldapssl => [false,
             "Whether SSL should be used when searching for nodes.
             Defaults to false because SSL usually requires certificates
@@ -623,4 +634,4 @@ module Puppet
     )
 end
 
-# $Id: configuration.rb 2587 2007-06-15 02:40:20Z luke $
+# $Id: configuration.rb 2669 2007-07-10 04:17:07Z luke $

data/lib/puppet/metatype/attributes.rb

@@ -236,7 +236,6 @@ class Puppet::Type
     # @parameters array, and does some basic checking on it.
     def self.newparam(name, options = {}, &block)
         options[:attributes] ||= {}
-        options[:attributes][:element] = self
         param = genclass(name,
             :parent => options[:parent] || Puppet::Parameter,
             :attributes => options[:attributes],
@@ -296,13 +295,16 @@ class Puppet::Type
                 [self.name, name]
         end
 
+        if parent = options[:parent]
+            options.delete(:parent)
+        else
+            parent = Puppet::Property
+        end
+
         # We have to create our own, new block here because we want to define
         # an initial :retrieve method, if told to, and then eval the passed
         # block if available.
-        prop = genclass(name,
-            :parent => options[:parent] || Puppet::Property,
-            :hash => @validproperties
-        ) do
+        prop = genclass(name, :parent => parent, :hash => @validproperties, :attributes => options) do
             # If they've passed a retrieve method, then override the retrieve
             # method on the class.
             if options[:retrieve]
@@ -323,15 +325,6 @@ class Puppet::Type
             @properties << prop
         end
 
-        if options[:event]
-            prop.event = options[:event]
-        end
-
-        # Grr.
-        if options[:required_features]
-            prop.required_features = options[:required_features]
-        end
-
 #        define_method(name) do
 #            @parameters[name].should
 #        end
@@ -485,7 +478,7 @@ class Puppet::Type
         if obj = @parameters[name]
             # We throw a failure here, because this method is too
             # ambiguous when used with properties.
-            if obj.is_a?(Puppet::Type::Property)
+            if obj.is_a?(Puppet::Property)
                 fail "[] called on a property"
             else
                 return obj.value
@@ -544,7 +537,7 @@ class Puppet::Type
     # retrieve the 'should' value for a specified property
     def should(name)
         name = attr_alias(name)
-        if prop = @parameters[name] and prop.is_a?(Puppet::Type::Property)
+        if prop = @parameters[name] and prop.is_a?(Puppet::Property)
             return prop.should
         else
             return nil
@@ -608,7 +601,7 @@ class Puppet::Type
     # return an actual type by name; to return the value, use 'inst[name]'
     # FIXME this method should go away
     def property(name)
-        if obj = @parameters[symbolize(name)] and obj.is_a?(Puppet::Type::Property)
+        if obj = @parameters[symbolize(name)] and obj.is_a?(Puppet::Property)
             return obj
         else
             return nil
@@ -683,7 +676,7 @@ class Puppet::Type
         }.find_all { |p|
             ! p.nil?
         }.each do |prop|
-            unless prop.is_a?(Puppet::Type::Property)
+            unless prop.is_a?(Puppet::Property)
                 raise Puppet::DevError, "got a non-property %s(%s)" %
                     [prop.class, prop.class.name]
             end
@@ -693,4 +686,4 @@ class Puppet::Type
     end
 end
 
-# $Id: attributes.rb 2513 2007-05-14 17:27:56Z luke $
+# $Id: attributes.rb 2676 2007-07-10 23:24:34Z luke $