diff options
Diffstat (limited to 'files')
| -rw-r--r-- | files/client/puppet.conf.FreeBSD | 26 | ||||
| -rw-r--r-- | files/master/lastruncheck | 6 | ||||
| -rw-r--r-- | files/master/puppet.conf | 2 |
3 files changed, 30 insertions, 4 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 149c655..d59e489 100644 --- a/files/master/lastruncheck +++ b/files/master/lastruncheck @@ -23,8 +23,8 @@ 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 |fqdn| - if node = Puppet::Node::Facts.find(fqdn) + @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 @@ -190,7 +190,7 @@ class Puppet::Application::Lastcheck < Puppet::Application exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs? #Puppet::Util::Log.newdestination :console - Puppet::Node::Facts.terminus_class = :yaml + 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}") diff --git a/files/master/puppet.conf b/files/master/puppet.conf index cf50317..fcaef0d 100644 --- a/files/master/puppet.conf +++ b/files/master/puppet.conf @@ -42,7 +42,7 @@ [puppetmasterd] reportdir = $logdir/reports autoflush = true - storeconfigs=true + #storeconfigs=true dbadapter=mysql dbserver=localhost dbuser=puppet |