puppet 0.24.9 → 0.25.0

data/conf/redhat/lsb-config.patch

@@ -1,51 +0,0 @@
---- puppet-0.18.0/conf/redhat/fileserver.conf.orig	2006-06-20 12:13:49.000000000 -0700
-+++ puppet-0.18.0/conf/redhat/fileserver.conf	2006-06-20 12:14:03.000000000 -0700
-@@ -6,7 +6,7 @@
- # for allow/deny does not matter, allow always takes precedence
- # over deny
- [files]
--  path /var/puppet/files
-+  path /var/lib/puppet/files
- #  allow *.example.com
- #  deny *.evil.example.com
- #  allow 192.168.0.0/24
---- puppet-0.18.0/conf/redhat/puppetd.conf.orig	2006-06-20 12:12:01.000000000 -0700
-+++ puppet-0.18.0/conf/redhat/puppetd.conf	2006-06-20 12:14:37.000000000 -0700
-@@ -1,5 +1,33 @@
-+[puppet]
-+    # Where Puppet stores dynamic and growing data.
-+    # The default value is '/var/puppet'.
-+    vardir = /var/lib/puppet
-+
-+    # The Puppet log directory.
-+    # The default value is '$vardir/log'.
-+    logdir = /var/log/puppet
-+
-+    # Where Puppet PID files are kept.
-+    # The default value is '$vardir/run'.
-+    rundir = /var/run/puppet
-+
-+    # Where lock files are kept.
-+    # The default value is '$vardir/locks'.
-+    lockdir = /var/lock
-+
-+    # Where SSL certificates are kept.
-+    # The default value is '$confdir/ssl'.
-+    ssldir = $vardir/ssl
-+
- [puppetd]
--# Make sure all log messages are sent to the right directory
--# This directory must be writable by the puppet user
--logdir=/var/log/puppet
--rundir=/var/run
-+    # The file in which puppetd stores a list of the classes
-+    # associated with the retrieved configuratiion.  Can be loaded in
-+    # the separate ``puppet`` executable using the ``--loadclasses``
-+    # option.
-+    # The default value is '$confdir/classes.txt'.
-+    classfile = $vardir/classes.txt
-+
-+    # Where puppetd caches the local configuration.  An
-+    # extension indicating the cache format is added automatically.
-+    # The default value is '$confdir/localconfig'.
-+    localconfig = $vardir/localconfig

data/conf/redhat/no-chuser-0.15.1.patch

@@ -1,38 +0,0 @@
---- puppet-0.15.1/bin/puppetmasterd.orig	2006-03-15 08:33:45.000000000 -0800
-+++ puppet-0.15.1/bin/puppetmasterd	2006-03-22 13:07:54.000000000 -0800
-@@ -210,14 +210,15 @@
-     exit(1)
- end
- 
--if Process.uid == 0
--    begin
--        Puppet::Util.chuser
--    rescue => detail
--        $stderr.puts "Could not change user to %s: %s" % [Puppet[:user], detail]
--        exit(39)
--    end
--end
-+# FIXME: Running as non-root is not ready for primetime
-+# if Process.uid == 0
-+#     begin
-+#         Puppet::Util.chuser
-+#     rescue => detail
-+#         $stderr.puts "Could not change user to %s: %s" % [Puppet[:user], detail]
-+#         exit(39)
-+#     end
-+# end
- 
- if Puppet[:parseonly]
-     # we would have already exited if the file weren't syntactically correct
---- puppet-0.15.1/bin/puppetca.orig	2006-02-07 15:12:39.000000000 -0800
-+++ puppet-0.15.1/bin/puppetca	2006-03-22 13:07:56.000000000 -0800
-@@ -138,7 +138,8 @@
- Puppet.genconfig
- Puppet.genmanifest
- 
--Puppet::Util.chuser
-+# FIXME: Running as non-root is not ready for primetime
-+# Puppet::Util.chuser
- 
- begin
-     ca = Puppet::SSLCertificates::CA.new()

data/conf/redhat/no-lockdir.patch

@@ -1,13 +0,0 @@
---- puppet-0.22.1/conf/redhat/puppetd.conf.orig	2006-09-27 10:30:35.000000000 -0700
-+++ puppet-0.22.1/conf/redhat/puppetd.conf	2007-02-11 13:27:04.000000000 -0800
-@@ -11,10 +11,6 @@
-     # The default value is '$vardir/run'.
-     rundir = /var/run/puppet
- 
--    # Where lock files are kept.
--    # The default value is '$vardir/locks'.
--    lockdir = /var/lock
--
-     # Where SSL certificates are kept.
-     # The default value is '$confdir/ssl'.
-     ssldir = $vardir/ssl

data/examples/mac_netinfo.pp

@@ -1,5 +0,0 @@
-#!/usr/bin/env puppet --debug
-
-user {
-    "jmccune": provider => "netinfo", ensure => present;
-}

data/ext/passenger/README

@@ -1,63 +0,0 @@
-
-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

@@ -1,29 +0,0 @@
-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

@@ -1,40 +0,0 @@
-# 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/lib/puppet/config_stores/rest.rb

@@ -1,60 +0,0 @@
-Puppet::Util::SettingsStore.newstore(:rest) do
-    desc "Store client configurations via a REST web service."
-
-    require 'net/http'
- 
-    # Get a client's config. (called in collector?)
-    def get(client, config)
-        # Assuming this comes in as Puppet::Parser objects
-        # we may need way to choose which transport data type we use.
-       
-        # hmm.. is this even useful for stored configs? I suppose there could
-        # be scenarios where it'd be cool, like ralsh or something.
-    end
-
-    def initialize
-        @host = Puppet[:puppetstorehost]
-        @port = Puppet[:puppetstoreport]
-
-	# Not sure if this is bad idea to share.
-        @http = Net::HTTP.new(@host, @port)
-    end
-
-    # Store config to the web service. (called in getconfig?)
-    def store(client, config)
-        # Probably store as yaml...
-        puppetstore = Thread.new do
-            benchmark(:notice, "Stored configuration for %s" % client) do
-                begin
-		    # config should come from elsewhere; probably in getconfig I assume.
-                    # should probably allow a config option for the serialization type.
-                    yaml = YAML.dump(config)
-                    url = "/collector/create"
-                    @http.post(url, yaml, { 'Content-Type' => 'text/yaml' })
-                rescue => detail
-                    Puppet.err("ERROR: storeconfig failed: ", detail.to_s)
-                end
-            end
-        end
-        puppetstore.run
-    end
-
-    # Rough first try... assuming the calling method handles the data type conversion
-    # Can we use a thread here? Probably needs to be the caller's thread.
-    def collect_exported(client, conditions)
-        begin
-            # Gotta be a better way... seems goofy to me.
-            # maybe using a nested rails rest route...
-           
-            # filterhost so we don't get exported resources for the current client
-            url = "/resources?restype=exported&filterhost=#{client}"
-            conditions.each_pair {|k,v| url << "&#{k}=#{v}"}
-            res = @http.get(url)
-        rescue => detail
-            Puppet.err("ERROR: collect_exported failed: ", detail.to_s)
-        end
-
-        return res.body unless !res.is_a?(Net::HTTPOK)
-    end
-
-end

data/lib/puppet/executables/client/certhandler.rb

@@ -1,82 +0,0 @@
-
-module Puppet
-    module Executables
-        module Client
-            class CertHandler
-                attr_writer :wait_for_cert, :one_time
-                attr_reader :new_cert
-                
-                def initialize(wait_time, is_one_time)
-                    @wait_for_cert = wait_time
-                    @one_time = is_one_time
-                    @new_cert = false
-                end
-
-                # Did we just read a cert?
-                def new_cert?
-                    new_cert
-                end
-                
-                # Read, or retrieve if necessary, our certificate.  Returns true if we retrieved
-                # a new cert, false if the cert already exists.
-                def read_retrieve 
-                    #NOTE: ACS this is checking that a file exists, maybe next time just do that?
-                    unless read_cert 
-                        # If we don't already have the certificate, then create a client to
-                        # request one.  Use the special ca stuff, don't use the normal server and port.
-                        retrieve_cert
-                    end
-
-                    ! new_cert?
-                end
-
-                def retrieve_cert
-                    caclient = Puppet::Network::Client.ca.new()
-
-                    while true do
-                       begin
-                           if caclient.request_cert 
-                               break if read_new_cert
-                           else
-                               Puppet.notice "Did not receive certificate"
-                               if @one_time 
-                                   Puppet.notice "Set to run 'one time'; exiting with no certificate"
-                                   exit(1)
-                               end
-                           end
-                       rescue StandardError => detail
-                          Puppet.err "Could not request certificate: %s" % detail.to_s
-                          exit(23) if @one_time
-                       end
-
-                        if @wait_for_cert > 0
-                            sleep @wait_for_cert
-                        else
-                            Puppet.notice "waitforcert disabled; exiting with no certificate"
-                            exit(1)
-                        end
-                    end
-                end
-
-                def read_cert
-                    Puppet::Network::HttpPool.read_cert
-                end
-
-                def read_new_cert
-                    if Puppet::Network::HttpPool.read_cert
-                        # If we read it in, then we need to get rid of our existing http connection.
-                        # The @new_cert flag will help us do that, in that it provides a way
-                        # to notify that the cert status has changed.
-                        @new_cert = true
-                        Puppet.notice "Got signed certificate"
-                    else
-                        Puppet.err "Could not read certificates after retrieving them"
-                        exit(34) if @one_time
-                    end
-
-                    return @new_cert
-                end
-            end
-        end
-    end
-end

data/lib/puppet/indirector/file_content/modules.rb

@@ -1,11 +0,0 @@
-#
-#  Created by Luke Kanies on 2007-10-18.
-#  Copyright (c) 2007. All rights reserved.
-
-require 'puppet/file_serving/content'
-require 'puppet/indirector/file_content'
-require 'puppet/indirector/module_files'
-
-class Puppet::Indirector::FileContent::Modules < Puppet::Indirector::ModuleFiles
-    desc "Retrieve file contents from modules."
-end

data/lib/puppet/indirector/file_metadata/modules.rb

@@ -1,17 +0,0 @@
-#
-#  Created by Luke Kanies on 2007-10-18.
-#  Copyright (c) 2007. All rights reserved.
-
-require 'puppet/file_serving/metadata'
-require 'puppet/indirector/file_metadata'
-require 'puppet/indirector/module_files'
-
-class Puppet::Indirector::FileMetadata::Modules < Puppet::Indirector::ModuleFiles
-    desc "Retrieve file metadata from modules."
-
-    def find(*args)
-        return unless instance = super
-        instance.collect_attributes
-        instance
-    end
-end

data/lib/puppet/indirector/module_files.rb

@@ -1,82 +0,0 @@
-#
-#  Created by Luke Kanies on 2007-10-19.
-#  Copyright (c) 2007. All rights reserved.
-
-require 'puppet/util/uri_helper'
-require 'puppet/indirector/terminus'
-require 'puppet/file_serving/configuration'
-require 'puppet/file_serving/fileset'
-require 'puppet/file_serving/terminus_helper'
-
-# Look files up in Puppet modules.
-class Puppet::Indirector::ModuleFiles < Puppet::Indirector::Terminus
-    include Puppet::Util::URIHelper
-    include Puppet::FileServing::TerminusHelper
-
-    # Is the client allowed access to this key with this method?
-    def authorized?(request)
-        return false unless [:find, :search].include?(request.method)
-
-        uri = key2uri(request.key)
-
-        # Make sure our file path starts with /modules, so that we authorize
-        # against the 'modules' mount.
-        path = uri.path =~ /^\/modules/ ? uri.path : "/modules" + uri.path
-
-        configuration.authorized?(path, :node => request.node, :ipaddress => request.ip)
-    end
-
-    # Find our key in a module.
-    def find(request)
-        return nil unless path = find_path(request)
-
-        result = model.new(request.key, :path => path)
-        result.links = request.options[:links] if request.options[:links]
-        return result
-    end
-
-    # Try to find our module.
-    def find_module(module_name, node_name)
-        Puppet::Module::find(module_name, environment(node_name))
-    end
-
-    # Search for a list of files.
-    def search(request)
-        return nil unless path = find_path(request)
-        path2instances(request, path)
-    end
-
-    private
-
-    # Our fileserver configuration, if needed.
-    def configuration
-        Puppet::FileServing::Configuration.create
-    end
-    
-    # Determine the environment to use, if any.
-    def environment(node_name)
-        if node_name and node = Puppet::Node.find(node_name)
-            node.environment
-        else
-            Puppet::Node::Environment.new.name
-        end
-    end
-
-    # The abstracted method for turning a key into a path; used by both :find and :search.
-    def find_path(request)
-        uri = key2uri(request.key)
-
-        # Strip off /modules if it's there -- that's how requests get routed to this terminus.
-        # Also, strip off the leading slash if present.
-        module_name, relative_path = uri.path.sub(/^\/modules\b/, '').sub(%r{^/}, '').split(File::Separator, 2)
-
-        # And use the environment to look up the module.
-        return nil unless mod = find_module(module_name, request.node)
-
-        path = File.join(mod.files, relative_path)
-
-        return nil unless FileTest.exists?(path)
-
-        return path
-    end
-end