puppet 0.23.2 → 0.24.0

data/bin/puppetdoc

@@ -68,33 +68,33 @@ Reference = Puppet::Util::Reference
 begin
     result.each { |opt,arg|
         case opt
-            when "--all"
-                options[:all] = true
-            when "--format"
-                method = "to_%s" % arg
-                if Reference.method_defined?(method)
-                    options[:format] = method
-                else
-                    raise "Invalid output format %s" % arg
-                end
-            when "--mode"
-                if Reference.modes.include?(arg)
-                    options[:mode] = arg.intern
-                else
-                    raise "Invalid output mode %s" % arg
-                end
-            when "--list"
-                puts Reference.references.collect { |r| Reference.reference(r).doc }.join("\n")
-                exit(0)
-            when "--reference"
-                options[:references] << arg.intern
-            when "--help"
-                if Puppet.features.usage?
-                    RDoc::usage && exit
-                else
-                    puts "No help available unless you have RDoc::usage installed"
-                    exit
-                end
+        when "--all"
+            options[:all] = true
+        when "--format"
+            method = "to_%s" % arg
+            if Reference.method_defined?(method)
+                options[:format] = method
+            else
+                raise "Invalid output format %s" % arg
+            end
+        when "--mode"
+            if Reference.modes.include?(arg)
+                options[:mode] = arg.intern
+            else
+                raise "Invalid output mode %s" % arg
+            end
+        when "--list"
+            puts Reference.references.collect { |r| Reference.reference(r).doc }.join("\n")
+            exit(0)
+        when "--reference"
+            options[:references] << arg.intern
+        when "--help"
+            if Puppet.features.usage?
+                RDoc::usage && exit
+            else
+                puts "No help available unless you have RDoc::usage installed"
+                exit
+            end
         end
     }
 rescue GetoptLong::InvalidOption => detail
@@ -150,4 +150,3 @@ else
 end
 
 
-# $Id: puppetdoc 2485 2007-05-08 19:29:38Z luke $

data/bin/puppetmasterd

@@ -7,7 +7,7 @@
 #
 # = Usage
 #
-#   puppetmasterd [-D|--daemonize] [-d|--debug] [-h|--help]
+#   puppetmasterd [-D|--daemonize|--no-daemonize] [-d|--debug] [-h|--help]
 #       [-l|--logdest <file>|console|syslog] [--nobucket] [--nonodes]
 #       [-v|--verbose] [-V|--version]
 #
@@ -28,11 +28,13 @@
 # '--genconfig'.
 #
 # daemonize::
-#   Send the process into the background.  This is the default unless
-#   +verbose+ or +debug+ is enabled.
+#   Send the process into the background.  This is the default.
+#
+# no-daemonize::
+#   Do not send the process into the background.
 #
 # debug::
-#   Enable full debugging.  Causes the daemon not to go into the background.
+#   Enable full debugging.
 #
 # help::
 #   Print this help message.
@@ -53,7 +55,7 @@
 #   Do not start the reports server.
 #
 # verbose::
-#   Enable verbosity.  Causes the daemon not to go into the background.
+#   Enable verbosity.
 #
 # version::
 #   Print the puppet version number and exit.
@@ -82,7 +84,6 @@ require 'puppet'
 require 'puppet/sslcertificates'
 
 options = [
-	[ "--daemonize", "-D",			GetoptLong::NO_ARGUMENT ],
 	[ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
 	[ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
 	[ "--logdest",	"-l",			GetoptLong::REQUIRED_ARGUMENT ],
@@ -95,14 +96,13 @@ options = [
 ]
 
 # Add all of the config parameters as valid options.
-Puppet.config.addargs(options)
+Puppet.settings.addargs(options)
 
 result = GetoptLong.new(*options)
 
 master = {}
 ca = {}
 report = {}
-fs = {}
 bucket = {}
 
 options = {
@@ -117,8 +117,8 @@ options = {
 begin
     result.each { |opt,arg|
         case opt
-            when "--daemonize"
-                options[:daemonize] = true
+            # First check to see if the argument is a valid configuration parameter;
+            # if so, set it. NOTE: there is a catch-all at the bottom for defaults.rb
             when "--debug"
                 options[:debug] = true
             when "--help"
@@ -152,7 +152,7 @@ begin
             when "--verbose"
                 options[:verbose] = true
             else
-                Puppet.config.handlearg(opt, arg)
+                Puppet.settings.handlearg(opt, arg)
         end
     }
 rescue GetoptLong::InvalidOption => detail
@@ -161,6 +161,9 @@ rescue GetoptLong::InvalidOption => detail
     exit(1)
 end
 
+# Now parse the config
+Puppet.parse_config
+
 # Handle the logging settings.
 if options[:debug] or options[:verbose]
     if options[:debug]
@@ -169,7 +172,7 @@ if options[:debug] or options[:verbose]
         Puppet::Util::Log.level = :info
     end
 
-    unless options[:daemonize]
+    unless Puppet[:daemonize]
         Puppet::Util::Log.newdestination(:console)
         options[:setdest] = true
     end
@@ -179,26 +182,17 @@ unless options[:setdest]
     Puppet::Util::Log.newdestination(:syslog)
 end
 
-# Now parse the config
-Puppet.parse_config
-
 Puppet.genconfig
 Puppet.genmanifest
 
-require 'etc'
+# A temporary solution, to at least make the master work for now.
+Puppet::Node::Facts.terminus_class = :yaml
 
-# Default to daemonizing, but if verbose or debug is specified,
-# default to staying in the foreground.
-unless options.include?(:daemonize)
-    if Puppet::Util::Log.level == :debug or Puppet::Util::Log.level == :info
-        options[:daemonize] = false
-    else
-        options[:daemonize] = true
-    end
-end
+require 'etc'
 
 handlers = {
     :Status => {},
+    :FileServer => {}
 }
 
 if options[:havemaster]
@@ -231,27 +225,16 @@ if Puppet[:parseonly]
     exit(0)
 end
 
-if File.exists?(Puppet[:fileserverconfig])
-    fs[:Config] = Puppet[:fileserverconfig]
-#else
-#    Puppet.notice "File server config %s does not exist; skipping file serving" %
-#        Puppet[:fileserverconfig]
-end
-
-if fs.include?(:Config)
-    handlers[:FileServer] = fs
-end
-
 webserver = server = nil
 begin
     case Puppet[:servertype]
     when "webrick"
         # use the default, um, everything
-        require 'puppet/network/server/webrick'
-        webserver = server = Puppet::Network::Server::WEBrick.new(:Handlers => handlers)
+        require 'puppet/network/http_server/webrick'
+        webserver = server = Puppet::Network::HTTPServer::WEBrick.new(:Handlers => handlers)
     when "mongrel":
-        require 'puppet/network/server/mongrel'
-        server = Puppet::Network::Server::Mongrel.new(handlers)
+        require 'puppet/network/http_server/mongrel'
+        server = Puppet::Network::HTTPServer::Mongrel.new(handlers)
         addr = Puppet[:bindaddress]
         if addr == ""
             addr =  "127.0.0.1"
@@ -288,7 +271,7 @@ if Puppet[:servertype] == "webrick"
 end
 Puppet.settraps
 
-if options[:daemonize]
+if Puppet[:daemonize]
     server.daemonize
 end
 
@@ -300,4 +283,3 @@ when "mongrel":
     webserver.run.join
 end
 
-# $Id: puppetmasterd 2659 2007-07-08 23:02:06Z luke $

data/bin/puppetrun

@@ -199,7 +199,7 @@ flags = [
 ]
 
 # Add all of the config parameters as valid options.
-Puppet.config.addargs(flags)
+Puppet.settings.addargs(flags)
 
 result = GetoptLong.new(*flags)
 
@@ -259,7 +259,7 @@ begin
             when "--debug"
                 options[:debug] = true
             else
-                Puppet.config.handlearg(opt, arg)
+                Puppet.settings.handlearg(opt, arg)
         end
     }
 rescue GetoptLong::InvalidOption => detail
@@ -278,7 +278,7 @@ config = File.join(Puppet[:confdir], "puppetmasterd.conf")
 Puppet.parse_config(config)
 
 if File.exists? config
-    Puppet.config.parse(config)
+    Puppet.settings.parse(config)
 end
 
 if Puppet[:ldapnodes]
@@ -402,4 +402,3 @@ while go
 end
 
 
-# $Id: puppetrun 2464 2007-05-06 05:42:53Z luke $

data/bin/ralsh

@@ -99,7 +99,7 @@ options = [
 ]
 
 # Add all of the config parameters as valid options.
-Puppet.config.addargs(options)
+Puppet.settings.addargs(options)
 
 result = GetoptLong.new(*options)
 
@@ -139,7 +139,7 @@ result.each { |opt,arg|
         debug = true
     else
         # Anything else is handled by the config stuff
-        Puppet.config.handlearg(opt, arg)
+        Puppet.settings.handlearg(opt, arg)
     end
 }
 
@@ -228,11 +228,10 @@ else
             params.each do |param, value|
                 obj[param] = value
             end
-            comp = Puppet::Type.type(:component).create(:name => "ralsh")
-            comp.push(obj)
-            transaction = comp.evaluate
+            catalog = Puppet::Node::Catalog.new
+            catalog.add_resource obj
             begin
-                transaction.evaluate
+                catalog.apply
             rescue => detail
                 if Puppet[:trace]
                     puts detail.backtrace
@@ -268,4 +267,3 @@ else
     puts text
 end
 
-# $Id: ralsh 2573 2007-06-13 22:31:52Z luke $

data/conf/redhat/puppet.spec

@@ -7,7 +7,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.23.2
+Version: 0.24.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -148,6 +148,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Wed Aug 22 2007 David Lutterkort <dlutter@redhat.com> - 0.23.2-1
+- New version
+
 * Thu Jul 26 2007 David Lutterkort <dlutter@redhat.com> - 0.23.1-1
 - Remove old config files
 

data/conf/solaris/smf/svc-puppetd

@@ -63,4 +63,4 @@ status)
 esac
 exit 0
 
-# $Id: svc-puppetd 1796 2006-10-17 06:09:41Z luke $
+# $Id$

data/conf/solaris/smf/svc-puppetmasterd

@@ -59,4 +59,4 @@ status)
 esac
 exit 0
 
-# $Id: svc-puppetmasterd 1403 2006-07-18 23:34:29Z luke $
+# $Id$

data/examples/code/allatonce

@@ -1,4 +1,4 @@
-# $Id: allatonce 832 2006-01-17 07:11:50Z luke $
+# $Id$
 
 define thingie {
     file { "/tmp/classtest": ensure => file, mode => 755 }

data/examples/code/assignments

@@ -1,4 +1,4 @@
-# $Id: assignments 409 2005-07-16 16:44:04Z luke $
+# $Id$
 
 $goodness = sunos
 

data/examples/code/components

@@ -1,4 +1,4 @@
-# $Id: components 832 2006-01-17 07:11:50Z luke $
+# $Id$
 
 # i still have no 'require'-like functionality, and i should also
 # have 'recommend'-like functionality...

data/examples/code/file.bl

@@ -1,4 +1,4 @@
-# $Id: file.bl 832 2006-01-17 07:11:50Z luke $
+# $Id$
 
 file {
     "/tmp/atest": ensure => file, mode => 755;

data/examples/code/filedefaults

@@ -1,4 +1,4 @@
-# $Id: filedefaults 832 2006-01-17 07:11:50Z luke $
+# $Id$
 
 File {
     mode => 755,

data/examples/code/fileparsing

@@ -1,4 +1,4 @@
-# $Id: fileparsing 397 2005-07-14 20:01:13Z luke $
+# $Id$
 
 # this will eventually parse different config files
 

data/examples/code/filerecursion

@@ -1,4 +1,4 @@
-# $Id: filerecursion 397 2005-07-14 20:01:13Z luke $
+# $Id$
 
 file { "/tmp/dirtest/b/a":
     mode => 755,

data/examples/code/functions

@@ -1,3 +1,3 @@
-# $Id: functions 409 2005-07-16 16:44:04Z luke $
+# $Id$
 
 $yaytest = fact("operatingsystem")

data/examples/code/groups

@@ -1,4 +1,4 @@
-# $Id: groups 231 2005-05-10 18:03:22Z luke $
+# $Id$
 
 # there need to be two forms of adding to groups:
 # add the current host to a group, and add a list of hosts to a

data/examples/code/head

@@ -1,4 +1,4 @@
-# $Id: head 587 2005-08-24 02:53:17Z luke $
+# $Id$
 
 # this file is responsible for importing all of the files we want to actually test
 

data/examples/code/importing

@@ -1,4 +1,4 @@
-# $Id: importing 417 2005-07-18 19:59:10Z luke $
+# $Id$
 
 #import "groups"
 # testing import loops

data/examples/code/modules/sample-module.pp

@@ -0,0 +1,10 @@
+# Jeff McCune <jeff.mccune@northstarlabs.net>
+# 2007-08-14
+#
+# Use:
+# puppet --verbose --debug --modulepath=`pwd` ./sample-module.pp
+#
+# sample-module demonstrates the use of a custom language function
+# included within the module bundle.
+
+include sample-module

data/examples/code/modules/sample-module/README.txt

@@ -0,0 +1,17 @@
+Jeff McCune <jeff.mccune@northstarlabs.net>
+2007-08-14
+
+This small, sample module demonstrates how to extend the puppet language
+with a new parser function.
+
+See:
+manifests/init.pp
+lib/puppet/parser/functions/hostname_to_dn.rb
+templates/sample.erb
+
+Note the consistent naming of files for Puppet::Util::Autoload
+
+Reference Documents:
+http://reductivelabs.com/trac/puppet/wiki/ModuleOrganisation
+http://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions
+http://reductivelabs.com/trac/puppet/wiki/FunctionReference

data/examples/code/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb

@@ -0,0 +1,36 @@
+# Copyright (C) David Schmitt <david@schmitt.edv-bus.at>
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of the Author nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+# Jeff McCune <jeff.mccune@northstarlabs.net>
+# 2007-08-14
+# See: http://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions
+
+module Puppet::Parser::Functions
+	newfunction(:hostname_to_dn, :type => :rvalue, :doc => "Given 'foo.bar.com', return 'dc=foo,dc=bar,dc=com'.") do |args|
+		args[0].split(/\./).map do |s| "dc=%s"%[s] end.join(",")
+	end
+end