Merge remote-tracking branch 'shared/master'

2 files changed, 36 insertions, 6 deletions

diff --git a/files/client/puppet.conf.FreeBSD b/files/client/puppet.conf.FreeBSD
new file mode 100644
index 0000000..71bcf77
--- /dev/null
+++ b/files/client/puppet.conf.FreeBSD
@@ -0,0 +1,26 @@
+[main]
+    logdir=/var/log/puppet
+    vardir=/var/puppet
+    rundir=/var/run/puppet
+    
+    ssldir=/var/puppet/ssl
+    
+    # Where 3rd party plugins and modules are installed
+    libdir = $vardir/lib
+    
+    templatedir=$vardir/templates
+
+    # Turn plug-in synchronization on.
+    pluginsync = true
+    pluginsource = puppet://$server/plugins
+    factpath = $vardir/lib/facter
+
+[puppetd]
+    report=true
+    server=server.example.com
+
+    # different run-interval, default= 30min
+    # e.g. run puppetd every 4 hours = 14400
+    # runinterval = 14400
+
+    logdest=$logdir/puppet.log
diff --git a/files/master/lastruncheck b/files/master/lastruncheck
index 420730f..d59e489 100644
--- a/files/master/lastruncheck
+++ b/files/master/lastruncheck
@@ -23,9 +23,11 @@ module Puppet::Lastcheck
       def facts_hosts
         return @facts_hosts if @facts_hosts
         require 'puppet/indirector/facts/yaml'
-        @facts_hosts = Puppet::Node::Facts.search("*").collect do |node|
-          { :hostname => node.name, :expired => node.expired?, :timestamp => node.values[:_timestamp], :expiration => node.expiration }
-        end
+        @facts_hosts = Puppet::Node::Facts.indirection.search("*").collect do |fqdn|
+          if node = Puppet::Node::Facts.indirection.find(fqdn)
+            { :hostname => node.name, :expired => node.expired?, :timestamp => node.values[:_timestamp], :expiration => node.expiration }
+          end
+        end.compact
       end
     end
   end
@@ -96,7 +98,9 @@ module Puppet::Lastcheck::Tests::Storedconfigs
     storedconfigs_hosts.each do |host|
       if !facts_hosts.any?{|fact_host| fact_host[:hostname] == host.name }
         add_failed_host(host.name, "In storedconfigs but no facts available!")
-      elsif host.last_compile.nil? || host.last_compile < (Time.now - @timeout)
+      elsif host.last_compile.nil?
+        add_failed_host(host.name, "No entry in storedconfigs")
+      elsif host.last_compile < (Time.now - @timeout)
         add_failed_host(host.name, "Last compile time in storedconfigs at #{host.last_compile}")
       end
     end
@@ -185,8 +189,8 @@ class Puppet::Application::Lastcheck < Puppet::Application
   def setup
     exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
 
-    Puppet::Util::Log.newdestination :console
-    Puppet::Node::Facts.terminus_class = :yaml
+    #Puppet::Util::Log.newdestination :console
+    Puppet::Node::Facts.indirection.terminus_class = :yaml
 
     Puppet::Lastcheck::Tests.tests.keys.each do |test|
       self.send("ignore_#{test}=", Puppet::Lastcheck::Tests.tests[test][:ignore_by_default]||false) unless self.send("ignore_#{test}")