diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-08-27 12:33:15 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-08-27 12:33:15 -0700 |
| commit | fb9034731ddae41f1009745eb8eb1ea53aa05cfb (patch) | |
| tree | 5cb8296af8859f59b9a20995105af77a9cdb2821 /ext | |
| parent | 16f701edd89a320ad73b5468d883dfb017fe6e96 (diff) | |
| parent | 8be1929043f4560bb17a4b06293b3f9a4efcfdbf (diff) | |
| download | puppet-fb9034731ddae41f1009745eb8eb1ea53aa05cfb.tar.gz puppet-fb9034731ddae41f1009745eb8eb1ea53aa05cfb.tar.xz puppet-fb9034731ddae41f1009745eb8eb1ea53aa05cfb.zip | |
Merge commit '2.6.1rc3' into next
Diffstat (limited to 'ext')
| -rwxr-xr-x | ext/puppetlast | 16 | ||||
| -rw-r--r-- | ext/rack/files/config.ru | 3 |
2 files changed, 1 insertions, 18 deletions
diff --git a/ext/puppetlast b/ext/puppetlast deleted file mode 100755 index 7434368a3..000000000 --- a/ext/puppetlast +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env ruby -# Puppetlast, a script to output the last check-in time of nodes. Also outputs the cached configuration state, if expired or not. -# -# AJ "Fujin" Christensen <aj@junglist.gen.nz> -# -require 'puppet' -require 'time' - -Puppet[:config] = "/etc/puppet/puppet.conf" -Puppet.parse_config -Puppet[:name] = "puppetmasterd" -Puppet::Node::Facts.terminus_class = :yaml - -Puppet::Node::Facts.search("*").sort { |a,b| a.name <=> b.name }.each do |node| - puts "#{node.name} checked in #{((Time.now - Time.parse(node.values[:_timestamp].to_s)) / 60).floor} minutes ago. Version #{node.values['puppetversion']}#{node.expired? ? ' Cache expired.' : ''}" -end diff --git a/ext/rack/files/config.ru b/ext/rack/files/config.ru index 995a9f8c5..f9c492dd7 100644 --- a/ext/rack/files/config.ru +++ b/ext/rack/files/config.ru @@ -4,8 +4,7 @@ # if puppet is not in your RUBYLIB: # $:.unshift('/opt/puppet/lib') -$0 = "puppetmasterd" -require 'puppet' +$0 = "master" # if you want debugging: # ARGV << "--debug" |