puppet 0.24.3 → 0.24.4

data/CHANGELOG

@@ -1,3 +1,69 @@
+    Pass source to pkg_add via the PKG_PATH environment variable if
+    it ends in a '/' indicating it is a directory. Allows pkg_add
+    to resolve dependancies, and make it possible to specify packages
+    without version numbers.
+
+    Fixing #571 -- provider suitability is now checked at resource
+    evaluation time, rather than resource instantiation time.  This
+    means that you don't catch your "errors" as early, but it also
+    means you should be able to realistically configure a whole host
+    in one run.
+
+    Moved the configuration of the Node cache to the puppetmasterd
+    executable, since it otherwise causes caches to be used in all
+    cases, which we don't want (e.g., bin/puppet was using them).
+
+    Ported #198 man page creation functionality to 0.24.x branch and
+    added man pages and man page creation logic to install.rb.  The
+    man pages are stored in man/man8 and will install to config::CONFIG
+    mandir/man8.
+
+    Fixing #1138 -- the yamldir is automatically created by the
+    server now that it's in the :puppetmasterd section rather than
+    a separate :yaml section.
+
+    Disabling http keep-alive as a means of preventing #1010.
+    There is now a constant in Puppet::Network::HttpPool that will
+    disable or enable this feature, but note that we determined
+    that it can cause corruption, especially in file serving (but
+    it's client-side corruption).
+
+    Applying patch by Ryan McBride to fix OpenBSD package 
+    matching.  The actual problem was caused by the fix to #1001.
+
+    Found all instances of methods where split() is used without
+    any local variables and added a local variable -- see
+    http://snurl.com/21zf8.  My own testing showed that this
+    caused memory growth to level off at a reasonable level.
+    Note that the link above says the problem is only with class
+    methods, but my own testing showed that it's any method that
+    meets these criteria.  This is not a functional change, but
+    should hopefully be the last nail in the coffin of #1131.
+
+    Found an array that leaked pretty quickly between reparsing
+    files, thanks to work by Adam Jacob and Arjuna Christenson
+    (the finding, not the leak).  I'm going to act like this
+    fixes #1131, at least for now, but I doubt it does,
+    since that shows general memory growth over time, whereas
+    the leak here should go away as soon as files are reparsed
+    (because the parser is holding the reference to the leaking
+    array).
+
+    Fixed #1147: Cached nodes are correctly considered out of
+    date if the node facts have been updated (thus causing
+    node facts to again be available in manifests, for those
+    cases where they were not).
+
+    Fixed #1137: The certificate name is correctly being added
+    to the facts hash.
+
+    Fixed #1136: Verbose and Debug no longer clobber each other.
+
+    Hopefully *finally* fixed the "already being managed" problem
+    (#1036).  The problem only cropped up if there was a failure
+    when trying to manage the system -- this would cause the
+    setting-based resources not to get cleaned up.
+
 0.24.3
     Modified the ldap node terminus to also use the facts version
     as the version for a node, which should similarly encourage the

data/Rakefile

@@ -134,3 +134,11 @@ task :dailyclean do
         File.unlink(file)
     end
 end
+
+task :tracdocs do
+    require 'puppet'
+    require 'puppet/util/reference'
+    Puppet::Util::Reference.references.each do |ref| 
+        sh "puppetdoc -m trac -r #{ref.to_s}"
+    end
+end

data/bin/puppetd

@@ -188,6 +188,8 @@ args = {}
 options = {
     :waitforcert => 120,  # Default to checking for certs every 5 minutes
     :onetime => false,
+    :verbose => false,
+    :debug => false,
     :centrallogs => false,
     :setdest => false,
     :enable => false,
@@ -228,11 +230,9 @@ begin
                 puts "%s" % Puppet.version
                 exit
             when "--verbose"
-                Puppet::Util::Log.level = :info
-                Puppet::Util::Log.newdestination(:console)
+                options[:verbose] = true
             when "--debug"
-                Puppet::Util::Log.level = :debug
-                Puppet::Util::Log.newdestination(:console)
+                options[:debug] = true
             when "--fqdn"
                 options[:fqdn] = arg
             when "--no-client"
@@ -247,6 +247,9 @@ begin
                     Puppet::Util::Log.newdestination(arg)
                     options[:setdest] = true
                 rescue => detail
+                    if Puppet[:debug]
+                        puts detail.backtrace
+                    end
                     $stderr.puts detail.to_s
                 end
             when "--waitforcert"
@@ -272,12 +275,23 @@ if options[:test]
     Puppet.settings.handlearg("--no-splay")
     Puppet.settings.handlearg("--show_diff")
     Puppet.settings.handlearg("--no-daemonize")
+    options[:verbose] = true
     options[:onetime] = true
     options[:waitforcert] = 0
-    unless Puppet::Util::Log.level == :debug
+end
+
+# Handle the logging settings.
+if options[:debug] or options[:verbose]
+    Puppet::Util::Log.newdestination(:console)
+    if options[:debug]
+        Puppet::Util::Log.level = :debug
+    else
         Puppet::Util::Log.level = :info
     end
-    Puppet::Util::Log.newdestination(:console)
+end
+
+unless options[:setdest]
+    Puppet::Util::Log.newdestination(:syslog)
 end
 
 Puppet.genconfig
@@ -288,10 +302,6 @@ if Puppet[:noop]
     Puppet[:show_diff] = true
 end
 
-unless options[:setdest]
-    Puppet::Util::Log.newdestination(:syslog)
-end
-
 args[:Server] = Puppet[:server]
 if options[:fqdn]
     args[:FQDN] = options[:fqdn]

data/bin/puppetmasterd

@@ -188,6 +188,9 @@ Puppet.genmanifest
 # A temporary solution, to at least make the master work for now.
 Puppet::Node::Facts.terminus_class = :yaml
 
+# Cache our nodes in yaml.  Currently not configurable.
+Puppet::Node.cache_class = :yaml
+
 require 'etc'
 
 handlers = {

data/conf/redhat/puppet.spec

@@ -7,7 +7,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.24.3
+Version: 0.24.4
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base

data/ext/emacs/puppet-mode.el

@@ -89,46 +89,108 @@
   (make-local-variable 'paragraph-ignore-fill-prefix)
   (setq paragraph-ignore-fill-prefix t))
 
+(defun puppet-comment-line-p ()
+  "Return non-nil iff this line is a comment."
+  (save-excursion
+    (beginning-of-line)
+    (looking-at (format "\\s-*%s" comment-start))))
+
+(defun puppet-in-array ()
+  "If point is in an array, return the position of the opening '[' of
+that array, else return nil."
+  (save-excursion
+    (save-match-data
+      (let ((opoint (point))
+            (apoint (search-backward "[" nil t)))
+        (when apoint
+          ;; An array opens before point.  If it doesn't close before
+          ;; point, then point must be in it.
+          ;; ### TODO: of course, the '[' could be in a string literal,
+          ;; ### in which case this whole idea is bogus.  But baby
+          ;; ### steps, baby steps.  A more robust strategy might be
+          ;; ### to walk backwards by sexps, until hit a wall, then
+          ;; ### inspect the nature of that wall.
+          (if (= (count-matches "\\]" apoint opoint) 0)
+              apoint))))))
+
 (defun puppet-indent-line ()
   "Indent current line as puppet code."
   (interactive)
   (beginning-of-line)
   (if (bobp)
       (indent-line-to 0)                ; First line is always non-indented
-    (let ((not-indented t) cur-indent)
-      (if (looking-at "^.*}") ; If the line we are looking at is the end of
-			      ; a block, then decrease the indentation
-          (progn
-            (save-excursion
-              (forward-line -1)
-            
-              (if (looking-at "^.*}")
-		  (progn
-                    (setq cur-indent (- (current-indentation) 2))
-		    (setq not-indented nil))
-		(setq cur-indent (- (current-indentation) 2))))
-	    (if (< cur-indent 0)     ; We can't indent past the left margin
-		(setq cur-indent 0)))
-	(save-excursion
-	  (while not-indented ; Iterate backwards until we find an
-			      ; indentation hint
-	    (forward-line -1)
-	    (if (looking-at "^.*}") ; This hint indicates that we need to
-				    ; indent at the level of the END_ token
-		(progn
-		  (setq cur-indent (current-indentation))
-		  (setq not-indented nil))
-	      (if (looking-at "^.*{") ; This hint indicates that we need to
-				      ; indent an extra level
-		  (progn
-                                        ; Do the actual indenting
-		    (setq cur-indent (+ (current-indentation) 2)) 
-		    (setq not-indented nil))
-		(if (bobp)
-		    (setq not-indented nil)))))))
+    (let ((not-indented t)
+          (array-start (puppet-in-array))
+          cur-indent)
+      (cond
+       (array-start
+        ;; This line probably starts with an element from an array.
+        ;; Indent the line to the same indentation as the first
+        ;; element in that array.  That is, this...
+        ;;
+        ;;    exec {     
+        ;;      "add_puppetmaster_mongrel_startup_links":
+        ;;      command => "string1",
+        ;;      creates => [ "string2", "string3", 
+        ;;      "string4", "string5", 
+        ;;      "string6", "string7",
+        ;;      "string3" ],
+        ;;      refreshonly => true,
+        ;;    }
+        ;; 
+        ;; ...should instead look like this:
+        ;;
+        ;;    exec {     
+        ;;      "add_puppetmaster_mongrel_startup_links":
+        ;;      command => "string1",
+        ;;      creates => [ "string2", "string3", 
+        ;;                   "string4", "string5", 
+        ;;                   "string6", "string7",
+        ;;                   "string8" ],
+        ;;      refreshonly => true,
+        ;;    }
+        (save-excursion
+          (goto-char array-start)
+          (forward-char 1)
+          (re-search-forward "\\S-")
+          (forward-char -1)
+          (setq cur-indent (current-column))))
+       ((looking-at "^[^{\n]*}")
+        ;; This line contains the end of a block, but the block does
+        ;; not also begin on this line, so decrease the indentation.
+        (save-excursion
+          (forward-line -1)
+          (if (looking-at "^.*}")
+              (progn
+                (setq cur-indent (- (current-indentation) 2))
+                (setq not-indented nil))
+            (setq cur-indent (- (current-indentation) 2))))
+        (if (< cur-indent 0)     ; We can't indent past the left margin
+            (setq cur-indent 0)))
+       (t
+        ;; Otherwise, we did not start on a block-ending-only line.
+        (save-excursion
+          ;; Iterate backwards until we find an indentation hint
+          (while not-indented
+            (forward-line -1)
+            (cond
+             ((puppet-comment-line-p)
+              (if (bobp)
+                  (setq not-indented nil)
+                ;; else ignore the line and continue iterating backwards
+                ))
+             ((looking-at "^.*}") ; indent at the level of the END_ token
+              (setq cur-indent (current-indentation))
+              (setq not-indented nil))
+             ((looking-at "^.*{") ; indent an extra level
+              (setq cur-indent (+ (current-indentation) 2)) 
+              (setq not-indented nil))
+             ((bobp)
+              (setq not-indented nil))
+             )))))
       (if cur-indent
-	  (indent-line-to cur-indent)
-	(indent-line-to 0)))))
+          (indent-line-to cur-indent)
+        (indent-line-to 0)))))
 
 
 ;;;###autoload
@@ -155,31 +217,31 @@ The variable puppet-indent-level controls the amount of indentation.
       (setq font-lock-variable-name-face font-lock-type-face))
 
   (setq puppet-font-lock-syntactic-keywords
-	'(
-	  ("\\(^\\|[=(,~?:;]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
-	   (4 (7 . ?/))
-	   (6 (7 . ?/)))
-	  ("^\\(=\\)begin\\(\\s \\|$\\)" 1 (7 . nil))
-	  ("^\\(=\\)end\\(\\s \\|$\\)" 1 (7 . nil))))
+        '(
+          ("\\(^\\|[=(,~?:;]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
+           (4 (7 . ?/))
+           (6 (7 . ?/)))
+          ("^\\(=\\)begin\\(\\s \\|$\\)" 1 (7 . nil))
+          ("^\\(=\\)end\\(\\s \\|$\\)" 1 (7 . nil))))
 
   (cond ((featurep 'xemacs)
-	 (put 'puppet-mode 'font-lock-defaults
-	      '((puppet-font-lock-keywords)
-		nil nil nil
-		beginning-of-line
-		(font-lock-syntactic-keywords
-		 . puppet-font-lock-syntactic-keywords))))
-	(t
-	 (add-hook 'puppet-mode-hook
-	    '(lambda ()
-	       (make-local-variable 'font-lock-defaults)
-	       (make-local-variable 'font-lock-keywords)
-	       (make-local-variable 'font-lock-syntax-table)
-	       (make-local-variable 'font-lock-syntactic-keywords)
-	       (setq font-lock-defaults '((puppet-font-lock-keywords) nil nil))
-	       (setq font-lock-keywords puppet-font-lock-keywords)
-	       (setq font-lock-syntax-table puppet-font-lock-syntax-table)
-	       (setq font-lock-syntactic-keywords puppet-font-lock-syntactic-keywords)))))
+         (put 'puppet-mode 'font-lock-defaults
+              '((puppet-font-lock-keywords)
+                nil nil nil
+                beginning-of-line
+                (font-lock-syntactic-keywords
+                 . puppet-font-lock-syntactic-keywords))))
+        (t
+         (add-hook 'puppet-mode-hook
+            '(lambda ()
+               (make-local-variable 'font-lock-defaults)
+               (make-local-variable 'font-lock-keywords)
+               (make-local-variable 'font-lock-syntax-table)
+               (make-local-variable 'font-lock-syntactic-keywords)
+               (setq font-lock-defaults '((puppet-font-lock-keywords) nil nil))
+               (setq font-lock-keywords puppet-font-lock-keywords)
+               (setq font-lock-syntax-table puppet-font-lock-syntax-table)
+               (setq font-lock-syntactic-keywords puppet-font-lock-syntactic-keywords)))))
 
   (defvar puppet-font-lock-syntax-table
     (let* ((tbl (copy-syntax-table puppet-mode-syntax-table)))
@@ -196,23 +258,23 @@ The variable puppet-indent-level controls the amount of indentation.
        1 font-lock-reference-face)
      ;; keywords
      (cons (concat
-	    "\\b\\(\\("
-	    (mapconcat
-	     'identity
-	     '("case"
+            "\\b\\(\\("
+            (mapconcat
+             'identity
+             '("case"
                "class"
                "default"
                "define"
-	       "false"
-	       "import"
-	       "include"
-	       "inherits"
-	       "node"
-	       "true"
-	       )
-	     "\\|")
-	    "\\)\\>\\)")
-	   1)
+               "false"
+               "import"
+               "include"
+               "inherits"
+               "node"
+               "true"
+               )
+             "\\|")
+            "\\)\\>\\)")
+           1)
      ;; variables
      '("\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(nil\\|self\\|true\\|false\\)\\>"
        2 font-lock-variable-name-face)

data/ext/puppet-test

@@ -216,10 +216,11 @@ end
 
 Suite.new :local_catalog, "Local catalog handling" do
     def prepare
+        @node = Puppet::Node.find(Puppet[:certname])
     end
 
     newtest :compile, "Compiled catalog" do
-        Puppet::Node::Catalog.find(Puppet[:certname])
+        Puppet::Node::Catalog.find(@node)
     end
 end
 

data/install.rb

@@ -47,6 +47,18 @@ rescue LoadError
     $haverdoc = false
 end
 
+begin
+    if $haverdoc
+       rst2man = %x{which rst2man.py}
+       $haveman = true
+    else
+       $haveman = false
+    end
+rescue
+    puts "Missing rst2man; skipping man page creation"
+    $haveman = false
+end
+
 PREREQS = %w{openssl facter xmlrpc/client xmlrpc/server cgi}
 
 InstallOptions = OpenStruct.new
@@ -64,6 +76,7 @@ sbins = glob(%w{sbin/*})
 bins  = glob(%w{bin/*})
 rdoc  = glob(%w{bin/* sbin/* lib/**/*.rb README README-library CHANGELOG TODO Install}).reject { |e| e=~ /\.(bat|cmd)$/ }
 ri    = glob(%w(bin/*.rb sbin/* lib/**/*.rb)).reject { |e| e=~ /\.(bat|cmd)$/ }
+man   = glob(%w{man/man8/*})
 libs  = glob(%w{lib/**/*.rb lib/**/*.py})
 tests = glob(%w{tests/**/*.rb})
 
@@ -84,6 +97,19 @@ def do_libs(libs, strip = 'lib/')
   end
 end
 
+def do_man(man, strip = 'man/')
+  man.each do |mf|
+    omf = File.join(InstallOptions.man_dir, mf.gsub(/#{strip}/, ''))
+    om = File.dirname(omf)
+    File.makedirs(om, true)
+    File.chmod(0644, om)
+    File.install(mf, omf, 0644, true)
+    gzip = %x{which gzip}
+    gzip.chomp!
+    %x{#{gzip} #{omf}}
+  end
+end
+
 # Verify that all of the prereqs are installed
 def check_prereqs
     PREREQS.each { |pre|
@@ -112,6 +138,17 @@ def prepare_installation
       InstallOptions.rdoc  = false
       InstallOptions.ri  = false
   end
+
+
+  if $haveman
+      InstallOptions.man = true
+      if RUBY_PLATFORM == "i386-mswin32"
+        InstallOptions.man  = false
+      end
+  else
+      InstallOptions.man = false
+  end
+
   InstallOptions.tests = true
 
   ARGV.options do |opts|
@@ -123,6 +160,9 @@ def prepare_installation
     opts.on('--[no-]ri', 'Prevents the creation of RI output.', 'Default off on mswin32.') do |onri|
       InstallOptions.ri = onri
     end
+    opts.on('--[no-]man', 'Presents the creation of man pages.', 'Default on.') do |onman|
+    InstallOptions.man = onman
+    end
     opts.on('--[no-]tests', 'Prevents the execution of unit tests.', 'Default on.') do |ontest|
       InstallOptions.tests = ontest
     end
@@ -163,15 +203,18 @@ def prepare_installation
   if (destdir = ENV['DESTDIR'])
     bindir = "#{destdir}#{Config::CONFIG['bindir']}"
     sbindir = "#{destdir}#{Config::CONFIG['sbindir']}"
+    mandir = "#{destdir}#{Config::CONFIG['mandir']}"
     sitelibdir = "#{destdir}#{sitelibdir}"
     tmpdirs << bindir
 
     FileUtils.makedirs(bindir)
     FileUtils.makedirs(sbindir)
+    FileUtils.makedirs(mandir)
     FileUtils.makedirs(sitelibdir)
   else
     bindir = Config::CONFIG['bindir']
     sbindir = Config::CONFIG['sbindir']
+    mandir = Config::CONFIG['mandir']
     tmpdirs << Config::CONFIG['bindir']
   end
 
@@ -180,6 +223,7 @@ def prepare_installation
   InstallOptions.bin_dir  = bindir
   InstallOptions.sbin_dir = sbindir
   InstallOptions.lib_dir  = libdir
+  InstallOptions.man_dir  = mandir
 end
 
 ##
@@ -212,6 +256,30 @@ def build_ri(files)
     end
 end
 
+def build_man(bins)
+    return unless $haveman
+    begin
+        # Locate rst2man
+        rst2man = %x{which rst2man.py}
+        rst2man.chomp!
+        # Create puppet.conf.8 man page
+        %x{bin/puppetdoc --reference configuration > ./puppet.conf.rst}
+        %x{#{rst2man} ./puppet.conf.rst ./man/man8/puppet.conf.8}
+        File.unlink("./puppet.conf.rst")
+
+        # Create binary man pages
+        bins.each do |bin|
+          b = bin.gsub( "bin/", "")
+          %x{#{bin} --help > ./#{b}.rst}
+          %x{#{rst2man} ./#{b}.rst ./man/man8/#{b}.8}
+          File.unlink("./#{b}.rst")
+        end
+    rescue SystemCallError
+        $stderr.puts "Couldn't build man pages: " + $!
+        $stderr.puts "Continuing with install..."
+    end
+end
+
 def run_tests(test_list)
 	begin
 		require 'test/unit/ui/console/testrunner'
@@ -309,6 +377,8 @@ prepare_installation
 run_tests(tests) if InstallOptions.tests
 #build_rdoc(rdoc) if InstallOptions.rdoc
 #build_ri(ri) if InstallOptions.ri
+#build_man(bins) if InstallOptions.man
 do_bins(sbins, InstallOptions.sbin_dir)
 do_bins(bins, InstallOptions.bin_dir)
 do_libs(libs)
+do_man(man)