puppet 0.24.5 → 0.24.6

data/ext/passenger/README

@@ -0,0 +1,63 @@
+
+PUPPETMASTER INSIDE APACHE & PASSENGER
+======================================
+
+This is about running a puppetmaster inside Apache.
+
+Please also see the docs at http://reductivelabs.com/trac/puppet/wiki/UsingPassenger
+for further information.
+
+
+WHAT IS IT?
+===========
+
+Passenger [1] (AKA mod_rails or mod_rack) is an Apache 2.x Extension for 
+serving Rails or Rack applications.
+
+This extension allows running a puppetmasterd as a Rack application;
+it has only been tested with Passenger.
+
+
+SHORT INSTALLATION INSTRUCTIONS
+===============================
+
+Make sure puppetmasterd ran at least once, so the SSL certificates
+got set up. 
+
+Install Rack:
+  gem install -v 0.4.0 rack
+
+Install Apache and Passenger:
+  apt-get install apache2
+  gem install passenger
+  passenger-install-apache2-module
+  (See the Passenger installation instructions [2] for details.)
+
+Enable Apache modules:
+  a2enmod ssl
+  a2enmod headers
+
+Configure Apache:
+  cp apache2.conf /etc/apache2/conf.d/puppetmasterd
+  vim /etc/apache2/conf.d/puppetmasterd (replace the server hostnames)
+
+Install the rack application [3]:
+  mkdir -p /usr/share/puppet/rack/puppetmasterd
+  mkdir /usr/share/puppet/rack/puppetmasterd/public /usr/share/puppet/rack/puppetmasterd/tmp
+  cp config.ru /usr/share/puppet/rack/puppetmasterd
+  chown puppet /usr/share/puppet/rack/puppetmasterd/config.ru
+
+Go:
+/etc/init.d/apache2 restart
+
+
+
+[1] http://www.modrails.com/
+
+[2] http://www.modrails.com/install.html
+
+[3] Passenger will not let applications run as root or the Apache user, 
+instead an implicit setuid will be done, to the user whom owns 
+config.ru. Therefore, config.ru shall be owned by the puppet user.
+
+

data/ext/passenger/apache2.conf

@@ -0,0 +1,29 @@
+Listen 8140
+<VirtualHost *:8140>
+	SSLEngine on
+	SSLCipherSuite SSLv2:-LOW:-EXPORT:RC4+RSA
+	SSLCertificateFile      /var/lib/puppet/ssl/certs/puppet-server.inqnet.at.pem
+	SSLCertificateKeyFile   /var/lib/puppet/ssl/private_keys/puppet-server.inqnet.at.pem
+	SSLCertificateChainFile /var/lib/puppet/ssl/ca/ca_crt.pem
+	SSLCACertificateFile    /var/lib/puppet/ssl/ca/ca_crt.pem
+	# If Apache complains about invalid signatures on the CRL, you can try disabling
+	# CRL checking by commenting the next line.
+	SSLCARevocationFile     /var/lib/puppet/ssl/ca/ca_crl.pem
+	SSLVerifyClient optional
+	SSLVerifyDepth  1
+	SSLOptions +StdEnvVars
+
+	# The following client headers allow the same configuration to work with Pound.
+	RequestHeader set X-SSL-Subject %{SSL_CLIENT_S_DN}e
+	RequestHeader set X-Client-DN %{SSL_CLIENT_S_DN}e
+	RequestHeader set X-Client-Verify %{SSL_CLIENT_VERIFY}e
+
+	RackAutoDetect On
+	DocumentRoot /usr/share/puppet/rack/puppetmasterd/public/
+	<Directory /usr/share/puppet/rack/puppetmasterd/>
+		Options None
+		AllowOverride None
+		Order allow,deny
+		allow from all
+	</Directory>
+</VirtualHost>

data/ext/passenger/config.ru

@@ -0,0 +1,40 @@
+# Author: Christian Hofstaedtler <hofstaedtler@inqnet.at>
+# Copyright (c) 2007 Luke Kanies, 2008 Christian Hofstaedtler
+#
+# This file is mostly based on puppetmasterd, which is part of
+# the standard puppet distribution.
+
+require 'rack'
+require 'puppet'
+require 'puppet/network/http_server/rack'
+
+# startup code from bin/puppetmasterd
+Puppet.parse_config
+Puppet::Util::Log.level = :info
+Puppet::Util::Log.newdestination(:syslog)
+# 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
+
+# The list of handlers running inside this puppetmaster
+handlers = {
+	:Status => {},
+	:FileServer => {},
+	:Master => {},
+	:CA => {},
+	:FileBucket => {},
+	:Report => {}
+}
+
+# Fire up the Rack-Server instance
+server = Puppet::Network::HTTPServer::Rack.new(handlers)
+
+# prepare the rack app
+app = proc do |env|
+	server.process(env)
+end
+
+# Go.
+run app
+

data/ext/puppetlast

@@ -1,40 +1,15 @@
 #!/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.
 #
-# Script to print out when puppet ran successfully last
-# AJ Christensen <aj@junglist.gen.nz>
+# AJ "Fujin" Christensen <aj@junglist.gen.nz>
 #
-
 require 'puppet'
-require 'puppet/defaults'
-require 'yaml'
 
 Puppet[:config] = "/etc/puppet/puppet.conf"
 Puppet.parse_config
+Puppet[:name] = "puppetmasterd"
+Puppet::Node::Facts.terminus_class = :yaml
 
-print "puppetlast\n"
-
-nodes = {}
-
-yfdir = Puppet.settings.value(:vardir) + "/yaml/facts"
-
-if yfdir
-   begin
-      Dir.chdir(yfdir) do
-         Dir.glob("*.yaml").each do |yaml|
-            data = YAML.load_file(yaml)
-            t = Time.now
-            age = t - data.version
-            nodes[data.name] = age.to_i
-         end
-      end
-
-      nodes.sort.each do |node,age|
-         minutes = age / 60 + 0.5
-         print minutes.floor.to_s + ' minutes ago: ' + node + "\n"
-      end
-
-   rescue
-      print 'error: ' + $! + "\n"
-   end
-
+Puppet::Node::Facts.search("*").sort { |a,b| a.name <=> b.name }.each do |node|
+  puts "#{node.name} #{node.expired? ? 'cached expired, ' : ''}checked in #{((Time.now - node.values[:_timestamp]) / 60).floor} minutes ago"
 end

data/ext/puppetstoredconfigclean.rb

@@ -0,0 +1,87 @@
+#!/usr/bin/env ruby
+
+# Script to clean up stored configs for (a) given host(s)
+#
+# Credits:
+# 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.
+
+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)
+end
+
+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
+
+            when "--help"
+            	printusage(0)
+
+            when "--usage"
+            	printusage(0)
+
+            when "--version"
+        		puts "%s" % Puppet.version
+				exit
+		end
+	end
+rescue GetoptLong::InvalidOption => detail
+    $stderr.puts "Try '#{$0} --help'"
+    exit(1)
+end
+
+printusage(1) unless ARGV.size > 0
+
+require 'puppet/rails'
+Puppet[:config] = config
+Puppet.parse_config
+pm_conf = Puppet.settings.instance_variable_get(:@values)[:puppetmasterd]
+
+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
+end
+
+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
+}
+exit 0

data/install.rb

@@ -60,6 +60,7 @@ rescue
 end
 
 PREREQS = %w{openssl facter xmlrpc/client xmlrpc/server cgi}
+MIN_FACTER_VERSION = 1.5
 
 InstallOptions = OpenStruct.new
 
@@ -102,7 +103,7 @@ def do_man(man, strip = 'man/')
     omf = File.join(InstallOptions.man_dir, mf.gsub(/#{strip}/, ''))
     om = File.dirname(omf)
     File.makedirs(om, true)
-    File.chmod(0644, om)
+    File.chmod(0755, om)
     File.install(mf, omf, 0644, true)
     gzip = %x{which gzip}
     gzip.chomp!
@@ -115,6 +116,15 @@ def check_prereqs
     PREREQS.each { |pre|
         begin
             require pre
+            if pre == "facter"
+              # to_f isn't quite exact for strings like "1.5.1" but is good
+              # enough for this purpose.
+              facter_version = Facter.version.to_f
+              if facter_version < MIN_FACTER_VERSION
+                puts "Facter version: %s; minimum required: %s; cannot install" % [facter_version, MIN_FACTER_VERSION]
+                exit -1
+              end
+            end
         rescue LoadError
             puts "Could not load %s; cannot install" % pre
             exit -1
@@ -166,6 +176,21 @@ def prepare_installation
     opts.on('--[no-]tests', 'Prevents the execution of unit tests.', 'Default on.') do |ontest|
       InstallOptions.tests = ontest
     end
+    opts.on('--destdir[=OPTIONAL]', 'Installation prefix for all targets', 'Default essentially /') do |destdir|
+      InstallOptions.destdir = destdir
+    end
+    opts.on('--bindir[=OPTIONAL]', 'Installation directory for binaries', 'overrides Config::CONFIG["bindir"]') do |bindir|
+      InstallOptions.bindir = bindir
+    end
+    opts.on('--sbindir[=OPTIONAL]', 'Installation directory for system binaries', 'overrides Config::CONFIG["sbindir"]') do |sbindir|
+      InstallOptions.sbindir = sbindir
+    end
+    opts.on('--sitelibdir[=OPTIONAL]', 'Installation directory for libraries', 'overrides Config::CONFIG["sitelibdir"]') do |sitelibdir|
+      InstallOptions.sitelibdir = sitelibdir
+    end
+    opts.on('--mandir[=OPTIONAL]', 'Installation directory for man pages', 'overrides Config::CONFIG["mandir"]') do |mandir|
+      InstallOptions.mandir = mandir
+    end
     opts.on('--quick', 'Performs a quick installation. Only the', 'installation is done.') do |quick|
       InstallOptions.rdoc   = false
       InstallOptions.ri     = false
@@ -190,16 +215,6 @@ def prepare_installation
   version = [Config::CONFIG["MAJOR"], Config::CONFIG["MINOR"]].join(".")
   libdir = File.join(Config::CONFIG["libdir"], "ruby", version)
 
-  sitelibdir = Config::CONFIG["sitelibdir"]
-  if sitelibdir.nil?
-    sitelibdir = $:.find { |x| x =~ /site_ruby/ }
-    if sitelibdir.nil?
-      sitelibdir = File.join(libdir, "site_ruby")
-    elsif sitelibdir !~ Regexp.quote(version)
-      sitelibdir = File.join(sitelibdir, version)
-    end
-  end
-
   # Mac OS X 10.5 declares bindir and sbindir as
   # /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin
   # /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/sbin
@@ -208,25 +223,65 @@ def prepare_installation
     Config::CONFIG['bindir'] = "/usr/bin"
     Config::CONFIG['sbindir'] = "/usr/sbin"
   end
+  
+  if not InstallOptions.bindir.nil?
+    bindir = InstallOptions.bindir
+  else
+    bindir = Config::CONFIG['bindir']
+  end
+  
+  if not InstallOptions.sbindir.nil?
+    sbindir = InstallOptions.sbindir
+  else
+    sbindir = Config::CONFIG['sbindir']
+  end
+  
+  if not InstallOptions.sitelibdir.nil?
+    sitelibdir = InstallOptions.sitelibdir
+  else
+    sitelibdir = Config::CONFIG["sitelibdir"]
+    if sitelibdir.nil?
+      sitelibdir = $:.find { |x| x =~ /site_ruby/ }
+      if sitelibdir.nil?
+        sitelibdir = File.join(libdir, "site_ruby")
+      elsif sitelibdir !~ Regexp.quote(version)
+        sitelibdir = File.join(sitelibdir, version)
+      end
+    end
+  end
+  
+  if not InstallOptions.mandir.nil?
+    mandir = InstallOptions.mandir
+  else
+    mandir = Config::CONFIG['mandir'] 
+  end
 
+  # To be deprecated once people move over to using --destdir option
   if (destdir = ENV['DESTDIR'])
-    bindir = "#{destdir}#{Config::CONFIG['bindir']}"
-    sbindir = "#{destdir}#{Config::CONFIG['sbindir']}"
-    mandir = "#{destdir}#{Config::CONFIG['mandir']}"
+    bindir = "#{destdir}#{bindir}"
+    sbindir = "#{destdir}#{sbindir}"
+    mandir = "#{destdir}#{mandir}"
+    sitelibdir = "#{destdir}#{sitelibdir}"
+
+    FileUtils.makedirs(bindir)
+    FileUtils.makedirs(sbindir)
+    FileUtils.makedirs(mandir)
+    FileUtils.makedirs(sitelibdir)
+  # This is the new way forward
+  elsif (destdir = InstallOptions.destdir)
+    bindir = "#{destdir}#{bindir}"
+    sbindir = "#{destdir}#{sbindir}"
+    mandir = "#{destdir}#{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
 
+  tmpdirs << bindir
+
   InstallOptions.tmp_dirs = tmpdirs.compact
   InstallOptions.site_dir = sitelibdir
   InstallOptions.bin_dir  = bindir

data/lib/puppet.rb

@@ -25,7 +25,7 @@ require 'puppet/util/suidmanager'
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-    PUPPETVERSION = '0.24.5'
+    PUPPETVERSION = '0.24.6'
 
     def Puppet.version
         return PUPPETVERSION