puppet 0.25.5 → 2.6.0

data/ext/nagios/check_puppet.rb

@@ -6,108 +6,114 @@ include Sys
 
 class CheckPuppet
 
-    VERSION = '0.1'
-    script_name = File.basename($0)
-
-    # default options
-    OPTIONS = {
-        :statefile => "/var/lib/puppet/state/state.yaml",
-        :process   => "puppetd",
-        :interval  => 30,
-    }
-
-    o = OptionParser.new do |o|
-        o.set_summary_indent('  ')
-        o.banner =    "Usage: #{script_name} [OPTIONS]"
-        o.define_head "The check_puppet Nagios plug-in checks that specified " +
-                  "Puppet process is running and the state file is no " +
-                  "older than specified interval."
-                  o.separator   ""
-                  o.separator   "Mandatory arguments to long options are mandatory for " +
-                  "short options too."
-
-                  o.on("-s", "--statefile=statefile", String, "The state file",
-         "Default: #{OPTIONS[:statefile]}") { |OPTIONS[:statefile]| }
-         o.on("-p", "--process=processname", String, "The process to check",
-         "Default: #{OPTIONS[:process]}")   { |OPTIONS[:process]| }
-         o.on("-i", "--interval=value", Integer,
-         "Default: #{OPTIONS[:interval]} minutes")  { |OPTIONS[:interval]| }
-
-         o.separator ""
-         o.on_tail("-h", "--help", "Show this help message.") do
-             puts o
-             exit
-         end
-
-         o.parse!(ARGV)
+  VERSION = '0.1'
+  script_name = File.basename($0)
+
+  # default options
+  OPTIONS = {
+    :statefile => "/var/lib/puppet/state/state.yaml",
+    :process   => "puppetd",
+    :interval  => 30,
+  }
+
+  o = OptionParser.new do |o|
+    o.set_summary_indent('  ')
+    o.banner =    "Usage: #{script_name} [OPTIONS]"
+    o.define_head "The check_puppet Nagios plug-in checks that specified Puppet process is running and the state file is no older than specified interval."
+      o.separator   ""
+      o.separator   "Mandatory arguments to long options are mandatory for short options too."
+
+
+        o.on(
+          "-s", "--statefile=statefile", String, "The state file",
+
+    "Default: #{OPTIONS[:statefile]}") { |OPTIONS[:statefile]| }
+
+      o.on(
+        "-p", "--process=processname", String, "The process to check",
+
+    "Default: #{OPTIONS[:process]}")   { |OPTIONS[:process]| }
+
+      o.on(
+        "-i", "--interval=value", Integer,
+
+    "Default: #{OPTIONS[:interval]} minutes")  { |OPTIONS[:interval]| }
+
+    o.separator ""
+    o.on_tail("-h", "--help", "Show this help message.") do
+      puts o
+      exit
     end
 
-    def check_proc
+    o.parse!(ARGV)
+  end
 
-        unless ProcTable.ps.find { |p| p.name == OPTIONS[:process]}
-            @proc = 2
-        else
-            @proc = 0
-        end
+  def check_proc
 
+    unless ProcTable.ps.find { |p| p.name == OPTIONS[:process]}
+      @proc = 2
+    else
+      @proc = 0
     end
 
-    def check_state
+  end
 
-        # Set variables
-        curt = Time.now
-        intv = OPTIONS[:interval] * 60
+  def check_state
 
-        # Check file time
-        begin
-            @modt = File.mtime("#{OPTIONS[:statefile]}")
-        rescue
-            @file = 3
-        end
+    # Set variables
+    curt = Time.now
+    intv = OPTIONS[:interval] * 60
 
-        diff = (curt - @modt).to_i
+    # Check file time
+    begin
+      @modt = File.mtime("#{OPTIONS[:statefile]}")
+    rescue
+      @file = 3
+    end
 
-        if diff > intv
-            @file = 2
-        else
-            @file = 0
-        end
+    diff = (curt - @modt).to_i
 
+    if diff > intv
+      @file = 2
+    else
+      @file = 0
     end
 
-    def output_status
-
-        case @file
-        when 0
-            state = "state file status okay updated on " + @modt.strftime("%m/%d/%Y at %H:%M:%S")
-        when 2
-            state = "state fille is not up to date and is older than #{OPTIONS[:interval]} minutes"
-        when 3
-            state = "state file status unknown"
-        end
-
-        case @proc
-        when 0
-            process = "process #{OPTIONS[:process]} is running"
-        when 2
-            process = "process #{OPTIONS[:process]} is not running"
-        end
-
-        case @proc or @file
-        when 0
-            status = "OK"
-            exitcode = 0
-        when 2
-            status = "CRITICAL"
-            exitcode = 2
-        when 3
-            status = "UNKNOWN"
-            exitcide = 3
-        end
-
-        puts "PUPPET " + status + ": " + process + ", " + state
-        exit(exitcode)
+  end
+
+  def output_status
+
+    case @file
+    when 0
+      state = "state file status okay updated on " + @modt.strftime("%m/%d/%Y at %H:%M:%S")
+    when 2
+      state = "state fille is not up to date and is older than #{OPTIONS[:interval]} minutes"
+    when 3
+      state = "state file status unknown"
     end
+
+    case @proc
+    when 0
+      process = "process #{OPTIONS[:process]} is running"
+    when 2
+      process = "process #{OPTIONS[:process]} is not running"
+    end
+
+    case @proc or @file
+    when 0
+      status = "OK"
+      exitcode = 0
+    when 2
+      status = "CRITICAL"
+      exitcode = 2
+    when 3
+      status = "UNKNOWN"
+      exitcide = 3
+    end
+
+    puts "PUPPET #{status}: #{process}, #{state}"
+    exit(exitcode)
+  end
 end
 
 cp = CheckPuppet.new

data/ext/nagios/naggen

@@ -29,7 +29,7 @@
 # just like any other executable.
 #
 # See the configuration file documentation at
-# http://puppetlabs.com/projects/puppet/reference/configref.html for
+# http://reductivelabs.com/projects/puppet/reference/configref.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet with
 # '--genconfig'.
@@ -63,7 +63,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2009 Puppet Labs, LLC
+# Copyright (c) 2009 Reductive Labs, LLC
 # Licensed under the GPL 2
 
 require 'puppet'
@@ -178,7 +178,7 @@ class NagiosWriter
     def initialize(nagios_type)
         @nagios_type = nagios_type
 
-        @bucket = Puppet::Network::Client.client(:Dipper).new(:Path => Puppet[:clientbucketdir])
+        @bucket = Puppet::FileBucket::Dipper.new(:Path => Puppet[:clientbucketdir])
     end
 
     def rails_resources

data/ext/puppet-test

@@ -23,7 +23,7 @@
 # parameter, so you can specify '--server <servername>' as an argument.
 #
 # See the configuration file documentation at
-# http://puppetlabs.com/projects/puppet/reference/configref.html for
+# http://reductivelabs.com/projects/puppet/reference/configref.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration $options can also be generated by running puppetd with
 # '--genconfig'.
@@ -90,7 +90,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005, 2006 Puppet Labs, LLC
+# Copyright (c) 2005, 2006 Reductive Labs, LLC
 # Licensed under the GNU Public License
 
 # Do an initial trap, so that cancels don't get a stack trace.
@@ -229,6 +229,30 @@ Suite.new :local_catalog, "Local catalog handling" do
     end
 end
 
+Suite.new :resource_type, "Managing resource types" do
+    newtest :find, "Find a type" do
+        Puppet::Resource::Type.terminus_class = :parser
+        ARGV.each do |name|
+            json = Puppet::Resource::Type.find(name).to_pson
+            data = PSON.parse(json)
+            p Puppet::Resource::Type.from_pson(data)
+        end
+    end
+
+    newtest :search_types, "Find all types" do
+        Puppet::Resource::Type.terminus_class = :rest
+        result = Puppet::Resource::Type.search("*")
+        result.each { |r| p r }
+    end
+
+    newtest :restful_type, "Find a type and return it via REST" do
+        Puppet::Resource::Type.terminus_class = :rest
+        ARGV.each do |name|
+            p Puppet::Resource::Type.find(name)
+        end
+    end
+end
+
 Suite.new :remote_catalog, "Remote catalog handling" do
     def prepare
         $args[:cache] = false
@@ -286,7 +310,7 @@ end
 Suite.new :filebucket, "Filebucket interactions" do
     def prepare
         require 'tempfile'
-        @client = Puppet::Network::Client.dipper.new($args)
+        @client = Puppet::FileBucket::Dipper.new($args)
     end
 
     newtest :backup, "Backed up file" do

data/ext/puppetlisten/puppetlisten.rb

@@ -15,7 +15,7 @@ Puppet[:config] = "/etc/puppet/puppet.conf"
 Puppet.parse_config
 
 # set the SSL environment
-ctx = OpenSSL::SSL::SSLContext.new()
+ctx = OpenSSL::SSL::SSLContext.new
 ctx.key = OpenSSL::PKey::RSA.new(File::read(Puppet[:hostprivkey]))
 ctx.cert = OpenSSL::X509::Certificate.new(File::read(Puppet[:hostcert]))
 ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
@@ -25,24 +25,24 @@ ctx.ca_file = Puppet[:localcacert]
 allowed_servers = Array.new
 runner = false;
 File.open(Puppet[:authconfig]).each do |line|
-    case line
-    when /^\s*#/: next # skip comments
-    when /^\s*$/: next # skip blank lines
-    when /\[puppetrunner\]/: # puppetrunner section
-        runner=true
-    when /^\s*(\w+)\s+(.+)$/:
-        var = $1
-        value = $2
-        case var
-        when "allow":
-            value.split(/\s*,\s*/).each { |val|
-            allowed_servers << val
-            puts "allowing %s access" % val
-        } if runner==true
-        end
-    else
-        runner=false
+  case line
+  when /^\s*#/: next # skip comments
+  when /^\s*$/: next # skip blank lines
+  when /\[puppetrunner\]/: # puppetrunner section
+    runner=true
+  when /^\s*(\w+)\s+(.+)$/:
+    var = $1
+    value = $2
+    case var
+    when "allow":
+      value.split(/\s*,\s*/).each { |val|
+      allowed_servers << val
+      puts "allowing #{val} access"
+    } if runner==true
     end
+  else
+    runner=false
+  end
 end
 
 # be a daemon
@@ -50,27 +50,27 @@ sock = TCPServer.new(port)
 ssls = OpenSSL::SSL::SSLServer.new(sock, ctx)
 
 loop do
-    begin
-        ns = ssls.accept # start SSL session
-        af, port, host, ip = ns.peeraddr
-        print "connection from #{host+"("+ip+")"} "
-        if allowed_servers.include?(host)
-            #TODO add support for tags and other command line arguments
-            puts "accepted"
-            ns.puts "Executing #{cmd} on #{Facter.fqdn}.\n*******OUTPUT********\n\n"
-            IO.popen(cmd) do |f|
-                while line = f.gets do
-                    ns.puts line
-                end
-            end
-            ns.puts "\n*********DONE**********"
-        else
-            ns.puts "denied\n"
-            puts "denied"
+  begin
+    ns = ssls.accept # start SSL session
+    af, port, host, ip = ns.peeraddr
+    print "connection from #{host+"("+ip+")"} "
+    if allowed_servers.include?(host)
+      #TODO add support for tags and other command line arguments
+      puts "accepted"
+      ns.puts "Executing #{cmd} on #{Facter.fqdn}.\n*******OUTPUT********\n\n"
+      IO.popen(cmd) do |f|
+        while line = f.gets
+          ns.puts line
         end
-        ns.close
-    rescue
-        ns.close
-        next
+      end
+      ns.puts "\n*********DONE**********"
+    else
+      ns.puts "denied\n"
+      puts "denied"
     end
+    ns.close
+  rescue
+    ns.close
+    next
+  end
 end

data/ext/puppetlisten/puppetrun.rb

@@ -6,10 +6,10 @@
 
 port = 8139
 if ARGV[0].nil?
-    warn "Usage: hostname to run against"
-    exit 1
+  warn "Usage: hostname to run against"
+  exit 1
 else
-    host = ARGV[0]
+  host = ARGV[0]
 end
 
 require 'puppet/sslcertificates/support'
@@ -20,7 +20,7 @@ Puppet[:config] = "/etc/puppet/puppet.conf"
 Puppet.parse_config
 
 # establish the certificate
-ctx = OpenSSL::SSL::SSLContext.new()
+ctx = OpenSSL::SSL::SSLContext.new
 ctx.key = OpenSSL::PKey::RSA.new(File::read(Puppet[:hostprivkey]))
 ctx.cert = OpenSSL::X509::Certificate.new(File::read(Puppet[:hostcert]))
 ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
@@ -31,9 +31,9 @@ s = TCPSocket.new(host, port)
 ssl = OpenSSL::SSL::SSLSocket.new(s, ctx)
 ssl.connect # start SSL session
 ssl.sync_close = true  # if true the underlying socket will be
-                       # closed in SSLSocket#close. (default: false)
+#                        closed in SSLSocket#close. (default: false)
 while (line = ssl.gets)
-    puts line
+  puts line
 end
 
 ssl.close

data/ext/puppetstoredconfigclean.rb

@@ -3,7 +3,7 @@
 # Script to clean up stored configs for (a) given host(s)
 #
 # Credits:
-# Script was taken from http://puppetlabs.com/trac/puppet/attachment/wiki/UsingStoredConfiguration/kill_node_in_storedconfigs_db.rb
+# Script was taken from http://reductivelabs.com/trac/puppet/attachment/wiki/UsingStoredConfiguration/kill_node_in_storedconfigs_db.rb
 # which haven been initially posted by James Turnbull
 # duritong adapted and improved the script a bit.
 
@@ -11,39 +11,42 @@ require 'getoptlong'
 config = '/etc/puppet/puppet.conf'
 
 def printusage(error_code)
-    puts "Usage: #{$0} [ list of hostnames as stored in hosts table ]"
-    puts "\n Options:"
-    puts "--config <puppet config file>"
-    exit(error_code)
+  puts "Usage: #{$0} [ list of hostnames as stored in hosts table ]"
+  puts "\n Options:"
+  puts "--config <puppet config file>"
+  exit(error_code)
 end
 
-opts = GetoptLong.new(
-        [ "--config",     "-c",   GetoptLong::REQUIRED_ARGUMENT ],
-        [ "--help",        "-h",   GetoptLong::NO_ARGUMENT ],
-        [ "--usage",       "-u",   GetoptLong::NO_ARGUMENT ],
-        [ "--version",     "-v",   GetoptLong::NO_ARGUMENT ]
+
+      opts = GetoptLong.new(
+                
+    [ "--config",     "-c",   GetoptLong::REQUIRED_ARGUMENT ],
+    [ "--help",        "-h",   GetoptLong::NO_ARGUMENT ],
+    [ "--usage",       "-u",   GetoptLong::NO_ARGUMENT ],
+        
+    [ "--version",     "-v",   GetoptLong::NO_ARGUMENT ]
 )
 
 begin
-    opts.each do |opt, arg|
-        case opt
-        when "--config"
-            config = arg
+  opts.each do |opt, arg|
+    case opt
+    when "--config"
+      config = arg
 
-        when "--help"
-            printusage(0)
+    when "--help"
+      printusage(0)
 
-        when "--usage"
-            printusage(0)
+    when "--usage"
+      printusage(0)
 
-        when "--version"
-            puts "%s" % Puppet.version
-            exit
-        end
+    when "--version"
+      puts "#{Puppet.version}"
+      exit
     end
+  end
 rescue GetoptLong::InvalidOption => detail
-    $stderr.puts "Try '#{$0} --help'"
-    exit(1)
+  $stderr.puts "Try '#{$0} --help'"
+  exit(1)
 end
 
 printusage(1) unless ARGV.size > 0
@@ -57,17 +60,20 @@ adapter = pm_conf[:dbadapter]
 args = {:adapter => adapter, :log_level => pm_conf[:rails_loglevel]}
 
 case adapter
-    when "sqlite3"
-        args[:dbfile] = pm_conf[:dblocation]
-    when "mysql", "postgresql"
-        args[:host]     = pm_conf[:dbserver] unless pm_conf[:dbserver].to_s.empty?
-        args[:username] = pm_conf[:dbuser] unless pm_conf[:dbuser].to_s.empty?
-        args[:password] = pm_conf[:dbpassword] unless pm_conf[:dbpassword].to_s.empty?
-        args[:database] = pm_conf[:dbname] unless pm_conf[:dbname].to_s.empty?
-        socket          = pm_conf[:dbsocket]
-        args[:socket]   = socket unless socket.to_s.empty?
-    else
-        raise ArgumentError, "Invalid db adapter %s" % adapter
+  when "sqlite3"
+    args[:dbfile] = pm_conf[:dblocation]
+  when "mysql", "postgresql"
+    args[:host]     = pm_conf[:dbserver] unless pm_conf[:dbserver].to_s.empty?
+    args[:username] = pm_conf[:dbuser] unless pm_conf[:dbuser].to_s.empty?
+    args[:password] = pm_conf[:dbpassword] unless pm_conf[:dbpassword].to_s.empty?
+    args[:database] = pm_conf[:dbname] unless pm_conf[:dbname].to_s.empty?
+    args[:port]     = pm_conf[:dbport] unless pm_conf[:dbport].to_s.empty?
+    socket          = pm_conf[:dbsocket]
+    args[:socket]   = socket unless socket.to_s.empty?
+    connections     = pm_conf[:dbconnections].to_i
+    args[:pool]     = connections if connections > 0
+  else
+    raise ArgumentError, "Invalid db adapter #{adapter}"
 end
 
 args[:database] = "puppet" unless not args[:database].to_s.empty?
@@ -75,13 +81,13 @@ args[:database] = "puppet" unless not args[:database].to_s.empty?
 ActiveRecord::Base.establish_connection(args)
 
 ARGV.each { |hostname|
-    if @host = Puppet::Rails::Host.find_by_name(hostname.strip)
-        print "Killing #{hostname}..."
-        $stdout.flush
-        @host.destroy
-        puts "done."
-    else
-        puts "Can't find host #{hostname}."
-    end
+  if @host = Puppet::Rails::Host.find_by_name(hostname.strip)
+    print "Killing #{hostname}..."
+    $stdout.flush
+    @host.destroy
+    puts "done."
+  else
+    puts "Can't find host #{hostname}."
+  end
 }
 exit 0