puppet 0.23.1 → 0.23.2

data/CHANGELOG

@@ -1,3 +1,34 @@
+    Fixed the problem in cron jobs where environment settings
+    tended to multiple. (#749)
+
+    Collection of resources now correctly only collects exported
+    resources again.  This was broken in 0.23.0. (#731)
+
+    'gen_config' now generates a configuration with
+    all parameters under a heading that matches the
+    process name, rather than keeping section headings.
+
+    Refactored how the parser and interpreter relate,
+    so parsing is now effectively an atomic process (thus
+    fixing #314 and #729).  This makes the interpreter less
+    prone to error and less prone to show the error to the
+    clients.  Note that this means that if a configuration
+    fails to parse, then the previous, parseable configuration
+    will be used instead, so the client will not know that
+    the configuration failed to parse.
+
+    Added support for managing interfaces, thanks to work
+    by Paul Rose.
+
+    Fixed #652, thanks to a patch by emerose; --fqdn again
+    works with puppetd.
+
+    Added an extra check to the Mongrel support so that
+    Apache can be used with optional cert checking, instead
+    of mandatory, thus allowing Mongrel to function as the CA.
+    This is thanks to work done by Marcin Owsiany.
+
+0.23.1
     You can now specify relationships to classes, which work
     exactly like relationships to defined types:
         require => Class[myclass]

data/bin/puppetd

@@ -295,6 +295,7 @@ end
 args[:Server] = Puppet[:server]
 if options[:fqdn]
     args[:FQDN] = options[:fqdn]
+    Puppet[:certname] = options[:fqdn] 
 end
 
 if options[:centrallogs]
@@ -446,4 +447,4 @@ else
     Puppet.start
 end
 
-# $Id: puppetd 2594 2007-06-15 23:11:43Z luke $
+# $Id: puppetd 2729 2007-07-30 22:05:44Z luke $

data/conf/redhat/puppet.spec

@@ -7,7 +7,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.23.1
+Version: 0.23.2
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -43,8 +43,6 @@ 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 
@@ -75,10 +73,12 @@ 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
-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
+# 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
 
 %files
 %defattr(-, root, root, 0755)
@@ -148,6 +148,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Thu Jul 26 2007 David Lutterkort <dlutter@redhat.com> - 0.23.1-1
+- Remove old config files
+
 * 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

data/conf/redhat/server.init

@@ -20,11 +20,10 @@ if [ -f /etc/sysconfig/puppetmaster ]; then
 	. /etc/sysconfig/puppetmaster
 fi
 
-[ -z "$PUPPETMASTER_MANIFEST" ] && PUPPETMASTER_MANIFEST=/etc/puppet/manifests/site.pp
-[ -z "$PUPPETMASTER_LOG" ] && PUPPETMASTER_LOG="/var/log/puppet/puppetmaster.log"
-PUPPETMASTER_OPTS="
-	--manifest=$PUPPETMASTER_MANIFEST \
-	--logdest=${PUPPETMASTER_LOG} \
+PUPPETMASTER_OPTS=""
+[ -n "$PUPPETMASTER_MANIFEST" ] && PUPPETMASTER_OPTS="--manifest=${PUPPETMASTER_MANIFEST}"
+[ -n "$PUPPETMASTER_LOG" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --logdest=${PUPPETMASTER_LOG}"
+PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} \
 	${PUPPETMASTER_EXTRA_OPTS}"
 
 RETVAL=0

data/examples/code/mac_dscl.pp

@@ -0,0 +1,28 @@
+#!/usr/bin/env puppet --debug --verbose --trace
+#
+# Jeff McCune: I use this for developing and testing the directory service
+#              provider.
+
+User  { provider => "directoryservice" }
+Group { provider => "directoryservice" }
+
+user {
+    "testgone": 
+        ensure => absent,
+        uid => 550;
+    "testhere":
+        ensure => present,
+        password => "foobar",
+        shell => "/bin/bash",
+        uid => 551;
+}
+
+group {
+    "testgone":
+        ensure => absent,
+        gid => 550;
+    "testhere":
+        ensure => present,
+        gid => 551;
+
+}

data/examples/code/mac_dscl_revert.pp

@@ -0,0 +1,26 @@
+#!/usr/bin/env puppet --debug --verbose --trace
+#
+# Jeff McCune: I use this for developing and testing the directory service
+#              provider.
+
+User  { provider => "directoryservice" }
+Group { provider => "directoryservice" }
+
+user {
+    "testgone": 
+        ensure => absent,
+        uid => 550;
+    "testhere":
+        ensure => absent,
+        uid => 551;
+}
+
+group {
+    "testgone":
+        ensure => absent,
+        gid => 550;
+    "testhere":
+        ensure => absent,
+        gid => 551;
+
+}

data/examples/code/mac_netinfo.pp

@@ -0,0 +1,5 @@
+#!/usr/bin/env puppet --debug
+
+user {
+    "jmccune": provider => "netinfo", ensure => present;
+}

data/examples/code/mac_pkgdmg.pp

@@ -0,0 +1,7 @@
+#!/usr/bin/env puppet
+#
+
+package
+{
+    "Foobar.pkg.dmg": ensure => present, provider => pkgdmg;
+}

data/ext/puppet-test

@@ -176,7 +176,8 @@ class Suite
             }
         end
 
-        $options[:repeat].times do
+        $options[:repeat].times do |i|
+            @count = i
             if forked?
                 msg = doc + " in PID %s" % Process.pid
             else
@@ -256,6 +257,72 @@ Suite.new :file, "File interactions" do
     end
 end
 
+# Note that this uses an env variable to determine how many resources per
+# host to create (with a default of 10).  'repeat' determines how
+# many hosts to create.  You probably will get mad failures if you
+# use forking and sqlite.
+# Here's an example run of this test, using sqlite:
+#   RESOURCE_COUNT=50 ext/puppet-test --suite rails --test storage --confdir /tmp/storagetesting --vardir /tmp/storagetesting --repeat 10
+Suite.new :rails, "Rails Interactions" do
+    def prepare
+        Puppet::Rails.init
+        @facts = Facter.to_hash
+
+        if num = ENV["RESOURCECOUNT"] 
+            @resources = Integer(num)
+        else
+            @resources = 10
+        end
+    end
+
+    Resource = Puppet::Parser::Resource
+
+    def execute(test, msg)
+        begin
+            send(test)
+        rescue => detail
+            puts detail.backtrace if Puppet[:trace]
+            Puppet.err "%s failed: %s" % [@name, detail.to_s]
+        end
+    end
+
+    def mkresource(type, title, parameters)
+        source = "fakesource"
+        res = Resource.new(:type => type, :title => title, :source => source, :scope => "fakescope")
+
+        parameters.each do |param, value|
+            res.set(param, value, source)
+        end
+        res
+    end
+
+    def ref(type, title)
+        Resource::Reference.new(:type => type, :title => title)
+    end
+
+    newtest :storage, "Stored resources" do
+        hostname = "host%s" % @count
+        @facts["hostname"] = hostname
+        args = {:facts => @facts, :name => hostname}
+
+        # Make all of the resources we want.  Make them at least slightly complex,
+        # so we model real resources as close as we can.
+        resources = []
+        args[:resources] = resources
+        @resources.times do |resnum|
+            exec = mkresource("exec", "exec%s" % resnum, :command => "/bin/echo do something %s" % resnum)
+            exec.tags = %w{exec one} << "exec%s" % resnum
+            user = mkresource("user", "user%s" % resnum, :uid => resnum.to_s, :require => ref("exec", "exec%s" % resnum))
+            user.tags = %w{user one two} << "user%s" % resnum
+            file = mkresource("file", "/tmp/file%s" % resnum, :owner => resnum.to_s, :require => [ref("exec", "exec%s" % resnum), ref("user", "user%s" % resnum)])
+            file.tags = %w{file one three} << "file%s" % resnum
+            file.exported = true
+            resources << exec << user << file
+        end
+        Puppet::Rails::Host.store(args)
+    end
+end
+
 $cmdargs = [
 	[ "--compile",    "-c",			GetoptLong::NO_ARGUMENT ],
 	[ "--describe",  "-D",			GetoptLong::REQUIRED_ARGUMENT ],
@@ -371,4 +438,4 @@ if $options[:fork] > 0
     Process.waitall
 end
 
-# $Id: puppet-test 2628 2007-06-19 20:04:52Z luke $
+# $Id: puppet-test 2731 2007-07-31 02:34:28Z luke $

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.1'
+    PUPPETVERSION = '0.23.2'
 
     def Puppet.version
         return PUPPETVERSION
@@ -428,4 +428,4 @@ if Puppet[:storeconfigs]
     require 'puppet/rails'
 end
 
-# $Id: puppet.rb 2724 2007-07-20 19:23:33Z luke $
+# $Id: puppet.rb 2754 2007-08-07 02:41:06Z luke $

data/lib/puppet/configuration.rb

@@ -313,6 +313,10 @@ module Puppet
         :ssl_client_header => ["HTTP_X_CLIENT_DN", "The header containing an authenticated
             client's SSL DN.  Only used with Mongrel.  This header must be set by the proxy
             to the authenticated client's SSL DN (e.g., ``/CN=puppet.reductivelabs.com``).
+            See the `UsingMongrel`:trac: wiki page for more information."],
+        :ssl_client_verify_header => ["HTTP_X_CLIENT_VERIFY", "The header containing the status
+            message of the client verification. Only used with Mongrel.  This header must be set by the proxy
+            to 'SUCCESS' if the client successfully authenticated, and anything else otherwise.
             See the `UsingMongrel`:trac: wiki page for more information."]
     )
 
@@ -634,4 +638,4 @@ module Puppet
     )
 end
 
-# $Id: configuration.rb 2669 2007-07-10 04:17:07Z luke $
+# $Id: configuration.rb 2752 2007-08-06 20:05:28Z luke $

data/lib/puppet/network/server/mongrel.rb

@@ -116,9 +116,9 @@ module Puppet::Network
         def client_info(request)
             params = request.params
             ip = params["REMOTE_ADDR"]
-            if dn = params[Puppet[:ssl_client_header]]
+            if dn = params[Puppet[:ssl_client_header]] and dn.include?("/CN=")
                 client = dn.sub("/CN=", '')
-                valid = true
+                valid = (params[Puppet[:ssl_client_verify_header]] == 'SUCCESS')
             else
                 client = Resolv.getname(ip)
                 valid = false
@@ -137,4 +137,4 @@ module Puppet::Network
     end
 end
 
-# $Id: mongrel.rb 2659 2007-07-08 23:02:06Z luke $
+# $Id: mongrel.rb 2752 2007-08-06 20:05:28Z luke $

data/lib/puppet/parser/ast.rb

@@ -86,7 +86,7 @@ class Puppet::Parser::AST
             error = Puppet::Error.new(detail.to_s)
             # We can't use self.fail here because it always expects strings,
             # not exceptions.
-            raise adderrorcontext(error)
+            raise adderrorcontext(error, detail)
         end
     end
 
@@ -117,4 +117,4 @@ end
 
 require 'puppet/parser/ast/leaf'
 
-# $Id: ast.rb 2463 2007-05-04 23:09:34Z luke $
+# $Id: ast.rb 2742 2007-08-03 23:49:53Z luke $

data/lib/puppet/parser/ast/component.rb

@@ -16,7 +16,7 @@ class Puppet::Parser::AST
         @name = :definition
 
         attr_accessor :classname, :arguments, :code, :scope, :keyword
-        attr_accessor :exported, :namespace, :interp, :virtual
+        attr_accessor :exported, :namespace, :parser, :virtual
 
         # These are retrieved when looking up the superclass
         attr_accessor :name
@@ -140,7 +140,7 @@ class Puppet::Parser::AST
         end
 
         def find_parentclass
-            @interp.findclass(namespace, parentclass)
+            @parser.findclass(namespace, parentclass)
         end
 
         # Set our parent class, with a little check to avoid some potential
@@ -223,4 +223,4 @@ class Puppet::Parser::AST
     end
 end
 
-# $Id: component.rb 2562 2007-06-11 21:54:37Z luke $
+# $Id: component.rb 2742 2007-08-03 23:49:53Z luke $

data/lib/puppet/parser/ast/node.rb

@@ -56,9 +56,9 @@ class Puppet::Parser::AST
         private
         # Search for the object matching our parent class.
         def find_parentclass
-            @interp.nodesearch(parentclass)
+            @parser.findnode(parentclass)
         end
     end
 end
 
-# $Id: node.rb 2511 2007-05-14 15:19:48Z luke $
+# $Id: node.rb 2742 2007-08-03 23:49:53Z luke $

data/lib/puppet/parser/collector.rb

@@ -23,7 +23,7 @@ class Puppet::Parser::Collector
         host = Puppet::Rails::Host.find_by_name(@scope.host)
 
         args = {:include => {:param_values => :param_name}}
-        args[:conditions] = "restype = '%s'" % [@type]
+        args[:conditions] = "(exported = 't' AND restype = '%s')" % [@type]
         if @equery
             args[:conditions] += " AND (%s)" % [@equery]
         end
@@ -182,4 +182,4 @@ class Puppet::Parser::Collector
     end
 end
 
-# $Id: collector.rb 2705 2007-07-18 17:32:46Z luke $
+# $Id: collector.rb 2746 2007-08-05 17:57:31Z luke $

data/lib/puppet/parser/interpreter.rb

@@ -30,6 +30,7 @@ class Puppet::Parser::Interpreter
             begin
                 options[:scope].function_include(classes.find_all { |c| options[:scope].findclass(c) })
             rescue => detail
+                puts detail.backtrace
                 raise Puppet::ParseError, "Could not evaluate classes for %s: %s" % [name, detail]
             end
         end
@@ -59,6 +60,7 @@ class Puppet::Parser::Interpreter
     class << self
         attr_writer :ldap
     end
+
     # just shorten the constant path a bit, using what amounts to an alias
     AST = Puppet::Parser::AST
 
@@ -105,10 +107,6 @@ class Puppet::Parser::Interpreter
         end
     end
 
-    def clear
-        initparsevars
-    end
-
     # Iteratively evaluate all of the objects.  This finds all of the objects
     # that represent definitions and evaluates the definitions appropriately.
     # It also adds defaults and overrides as appropriate.
@@ -264,48 +262,13 @@ class Puppet::Parser::Interpreter
         check_resource_collections(scope)
     end
 
-    # Find a class definition, relative to the current namespace.
+    # Create proxy methods, so the scopes can call the interpreter, since
+    # they don't have access to the parser.
     def findclass(namespace, name)
-        #find_or_load namespace, name, @classtable
-        fqfind namespace, name, @classtable
+        @parser.findclass(namespace, name)
     end
-
-    # Find a component definition, relative to the current namespace.
     def finddefine(namespace, name)
-        #find_or_load namespace, name, @definetable
-        fqfind namespace, name, @definetable
-    end
-
-    # The recursive method used to actually look these objects up.
-    def fqfind(namespace, name, table)
-        namespace = namespace.downcase
-        name = name.downcase
-        if name =~ /^::/ or namespace == ""
-            classname = name.sub(/^::/, '')
-            unless table[classname]
-                self.load(classname)
-            end
-            return table[classname]
-        end
-        ary = namespace.split("::")
-
-        while ary.length > 0
-            newname = (ary + [name]).join("::").sub(/^::/, '')
-            if obj = table[newname] or (self.load(newname) and obj = table[newname])
-                return obj
-            end
-
-            # Delete the second to last object, which reduces our namespace by one.
-            ary.pop
-        end
-
-        # If we've gotten to this point without finding it, see if the name
-        # exists at the top namespace
-        if obj = table[name] or (self.load(name) and obj = table[name])
-            return obj
-        end
-
-        return nil
+        @parser.finddefine(namespace, name)
     end
 
     # create our interpreter
@@ -335,8 +298,6 @@ class Puppet::Parser::Interpreter
 
         @setup = false
 
-        initparsevars()
-
         # Set it to either the value or nil.  This is currently only used
         # by the cfengine module.
         @classes = hash[:Classes] || []
@@ -361,55 +322,11 @@ class Puppet::Parser::Interpreter
         end
 
         @files = []
-        @loaded = []
 
         # Create our parser object
         parsefiles
     end
 
-    # Initialize or reset the variables related to parsing.
-    def initparsevars
-        @classtable = {}
-        @namespace = "main"
-
-        @nodetable = {}
-
-        @definetable = {}
-    end
-
-    # Try to load a class, since we could not find it.
-    def load(classname)
-        return false if classname == ""
-        filename = classname.gsub("::", File::SEPARATOR)
-
-        loaded = false
-        # First try to load the top-level module
-        mod = filename.scan(/^[\w-]+/).shift
-        unless @loaded.include?(mod)
-            @loaded << mod
-            begin
-                @parser.import(mod)
-                Puppet.info "Autoloaded module %s" % mod
-                loaded = true
-            rescue Puppet::ImportError => detail
-                # We couldn't load the module
-            end
-        end
-
-        unless filename == mod and ! @loaded.include?(mod)
-            @loaded << mod
-            # Then the individual file
-            begin
-                @parser.import(filename)
-                Puppet.info "Autoloaded file %s from module %s" % [filename, mod]
-                loaded = true
-            rescue Puppet::ImportError => detail
-                # We couldn't load the file
-            end
-        end
-        return loaded
-    end
-
     # Find the ldap node, return the class list and parent node specially,
     # and everything else in a parameter hash.
     def ldapsearch(node)
@@ -505,115 +422,10 @@ class Puppet::Parser::Interpreter
         end
     end
 
-    # Split an fq name into a namespace and name
-    def namesplit(fullname)
-        ary = fullname.split("::")
-        n = ary.pop || ""
-        ns = ary.join("::")
-        return ns, n
-    end
-
-    # Create a new class, or merge with an existing class.
-    def newclass(name, options = {})
-        name = name.downcase
-        if @definetable.include?(name)
-            raise Puppet::ParseError, "Cannot redefine class %s as a definition" %
-                name
-        end
-        code = options[:code]
-        parent = options[:parent]
-
-        # If the class is already defined, then add code to it.
-        if other = @classtable[name]
-            # Make sure the parents match
-            if parent and other.parentclass and (parent != other.parentclass)
-                @parser.error("Class %s is already defined at %s:%s; cannot redefine" % [name, other.file, other.line])
-            end
-
-            # This might be dangerous...
-            if parent and ! other.parentclass
-                other.parentclass = parent
-            end
-
-            # This might just be an empty, stub class.
-            if code
-                tmp = name
-                if tmp == ""
-                    tmp = "main"
-                end
-                
-                Puppet.debug @parser.addcontext("Adding code to %s" % tmp)
-                # Else, add our code to it.
-                if other.code and code
-                    other.code.children += code.children
-                else
-                    other.code ||= code
-                end
-            end
-        else
-            # Define it anew.
-            # Note we're doing something somewhat weird here -- we're setting
-            # the class's namespace to its fully qualified name.  This means
-            # anything inside that class starts looking in that namespace first.
-            args = {:namespace => name, :classname => name, :interp => self}
-            args[:code] = code if code
-            args[:parentclass] = parent if parent
-            @classtable[name] = @parser.ast AST::HostClass, args
-        end
-
-        return @classtable[name]
-    end
-
-    # Create a new definition.
-    def newdefine(name, options = {})
-        name = name.downcase
-        if @classtable.include?(name)
-            raise Puppet::ParseError, "Cannot redefine class %s as a definition" %
-                name
-        end
-        # Make sure our definition doesn't already exist
-        if other = @definetable[name]
-            @parser.error("%s is already defined at %s:%s; cannot redefine" % [name, other.file, other.line])
-        end
-
-        ns, whatever = namesplit(name)
-        args = {
-            :namespace => ns,
-            :arguments => options[:arguments],
-            :code => options[:code],
-            :classname => name
-        }
-
-        [:code, :arguments].each do |param|
-            args[param] = options[param] if options[param]
-        end
-
-        @definetable[name] = @parser.ast AST::Component, args
-    end
-
-    # Create a new node.  Nodes are special, because they're stored in a global
-    # table, not according to namespaces.
-    def newnode(names, options = {})
-        names = [names] unless names.instance_of?(Array)
-        names.collect do |name|
-            name = name.to_s.downcase
-            if other = @nodetable[name]
-                @parser.error("Node %s is already defined at %s:%s; cannot redefine" % [other.name, other.file, other.line])
-            end
-            name = name.to_s if name.is_a?(Symbol)
-            args = {
-                :name => name,
-            }
-            if options[:code]
-                args[:code] = options[:code]
-            end
-            if options[:parent]
-                args[:parentclass] = options[:parent]
-            end
-            @nodetable[name] = @parser.ast(AST::Node, args)
-            @nodetable[name].classname = name
-            @nodetable[name].interp = self
-            @nodetable[name]
+    # Pass these methods through to the parser.
+    [:newclass, :newdefine, :newnode].each do |name|
+        define_method(name) do |*args|
+            @parser.send(name, *args)
         end
     end
 
@@ -662,7 +474,7 @@ class Puppet::Parser::Interpreter
 
     # See if our node was defined in the code.
     def nodesearch_code(name)
-        @nodetable[name]
+        @parser.nodes[name]
     end
     
     # Look for external node definitions.
@@ -815,29 +627,40 @@ class Puppet::Parser::Interpreter
             end
         end
 
-        # Reset our parse tables.
-        clear()
-
-        # Create a new parser, just to keep things fresh.
-        @parser = Puppet::Parser::Parser.new(self)
+        # Create a new parser, just to keep things fresh.  Don't replace our
+        # current parser until we know weverything works.
+        newparser = Puppet::Parser::Parser.new()
         if @code
-            @parser.string = @code
+            newparser.string = @code
         else
-            @parser.file = @file
-            # Mark when we parsed, so we can check freshness
-            @parsedate = File.stat(@file).ctime.to_i
+            newparser.file = @file
         end
 
         # Parsing stores all classes and defines and such in their
         # various tables, so we don't worry about the return.
-        if @local
-            @parser.parse
-        else
-            benchmark(:info, "Parsed manifest") do
-                @parser.parse
+        begin
+            if @local
+                newparser.parse
+            else
+                benchmark(:info, "Parsed manifest") do
+                    newparser.parse
+                end
+            end
+            # We've gotten this far, so it's ok to swap the parsers.
+            oldparser = @parser
+            @parser = newparser
+            if oldparser
+                oldparser.clear
+            end
+
+            # Mark when we parsed, so we can check freshness
+            @parsedate = Time.now.to_i
+        rescue => detail
+            if Puppet[:trace]
+                puts detail.backtrace
             end
+            Puppet.err "Could not parse; using old configuration: %s" % detail
         end
-        @parsedate = Time.now.to_i
     end
 
     # Store the configs into the database.
@@ -882,4 +705,4 @@ class Puppet::Parser::Interpreter
     end
 end
 
-# $Id: interpreter.rb 2720 2007-07-20 03:36:54Z luke $
+# $Id: interpreter.rb 2742 2007-08-03 23:49:53Z luke $