puppet 0.9.2 → 0.13.0

data/examples/code/snippets/implicititeration

@@ -1,15 +1,15 @@
-# $Id: implicititeration 589 2005-08-25 20:54:16Z luke $
+# $Id: implicititeration 832 2006-01-17 07:11:50Z luke $
 
 $files = ["/tmp/iterationatest", "/tmp/iterationbtest"]
 
-file { $files: create => true, mode => 755 }
+file { $files: ensure => file, mode => 755 }
 
 file { ["/tmp/iterationctest", "/tmp/iterationdtest"]:
-    create => true,
+    ensure => file,
     mode => 755
 }
 
 file {
-    ["/tmp/iterationetest", "/tmp/iterationftest"]: create => true, mode => 755;
-    ["/tmp/iterationgtest", "/tmp/iterationhtest"]: create => true, mode => 755;
+    ["/tmp/iterationetest", "/tmp/iterationftest"]: ensure => file, mode => 755;
+    ["/tmp/iterationgtest", "/tmp/iterationhtest"]: ensure => file, mode => 755;
 }

data/examples/code/snippets/multipleinstances

@@ -1,7 +1,7 @@
-# $Id: multipleinstances 589 2005-08-25 20:54:16Z luke $
+# $Id: multipleinstances 832 2006-01-17 07:11:50Z luke $
 
 file {
-    "/tmp/multipleinstancesa": create => true, mode => 755;
-    "/tmp/multipleinstancesb": create => true, mode => 755;
-    "/tmp/multipleinstancesc": create => true, mode => 755;
+    "/tmp/multipleinstancesa": ensure => file, mode => 755;
+    "/tmp/multipleinstancesb": ensure => file, mode => 755;
+    "/tmp/multipleinstancesc": ensure => file, mode => 755;
 }

data/examples/code/snippets/namevartest

@@ -1,9 +1,9 @@
-define filetest(mode, create = true) {
+define filetest(mode, ensure = file) {
     file { $name:
         mode => $mode,
-        create => $create
+        ensure => $ensure
     }
 }
 
 filetest { "/tmp/testfiletest": mode => 644}
-filetest { "/tmp/testdirtest": mode => 755, create => directory}
+filetest { "/tmp/testdirtest": mode => 755, ensure => directory}

data/examples/code/snippets/scopetest

@@ -2,7 +2,7 @@
 $mode = 640
 
 define thing {
-    file { "/tmp/scopetest": create => true, mode => $mode }
+    file { "/tmp/scopetest": ensure => file, mode => $mode }
 }
 
 class testing {

data/examples/code/snippets/selectorvalues.pp

@@ -17,6 +17,6 @@ $mode3 = $value3 ? {
     default => 644
 }
 
-file { "/tmp/selectorvalues1": create => true, mode => $mode1 }
-file { "/tmp/selectorvalues2": create => true, mode => $mode2 }
-file { "/tmp/selectorvalues3": create => true, mode => $mode3 }
+file { "/tmp/selectorvalues1": ensure => file, mode => $mode1 }
+file { "/tmp/selectorvalues2": ensure => file, mode => $mode2 }
+file { "/tmp/selectorvalues3": ensure => file, mode => $mode3 }

data/examples/code/snippets/simpledefaults

@@ -1,5 +1,5 @@
-# $Id: simpledefaults 576 2005-08-23 16:09:14Z luke $
+# $Id: simpledefaults 832 2006-01-17 07:11:50Z luke $
 
 File { mode => 755 }
 
-file { "/tmp/defaulttest": create => true }
+file { "/tmp/defaulttest": ensure => file }

data/examples/code/snippets/simpleselector

@@ -1,9 +1,9 @@
-# $Id: simpleselector 576 2005-08-23 16:09:14Z luke $
+# $Id: simpleselector 832 2006-01-17 07:11:50Z luke $
 
 $var = "value"
 
 file { "/tmp/snippetselectatest":
-    create => true,
+    ensure => file,
     mode => $var ? {
         nottrue => 641,
         value => 755
@@ -11,7 +11,7 @@ file { "/tmp/snippetselectatest":
 }
 
 file { "/tmp/snippetselectbtest":
-    create => true,
+    ensure => file,
     mode => $var ? {
         nottrue => 644,
         default => 755
@@ -21,7 +21,7 @@ file { "/tmp/snippetselectbtest":
 $othervar = "complex value"
 
 file { "/tmp/snippetselectctest":
-    create => true,
+    ensure => file,
     mode => $othervar ? {
         "complex value" => 755,
         default => 644
@@ -30,7 +30,7 @@ file { "/tmp/snippetselectctest":
 $anothervar = Yayness
 
 file { "/tmp/snippetselectdtest":
-    create => true,
+    ensure => file,
     mode => $anothervar ? {
         Yayness => 755,
         default => 644

data/examples/code/snippets/singleary.pp

@@ -0,0 +1,19 @@
+# $Id: singleary.pp 841 2006-01-18 17:24:15Z luke $
+
+file { "/tmp/singleary1":
+    ensure => file
+}
+
+file { "/tmp/singleary2":
+    ensure => file
+}
+
+file { "/tmp/singleary3":
+    ensure => file,
+    require => [file["/tmp/singleary1"], file["/tmp/singleary2"]]
+}
+
+file { "/tmp/singleary4":
+    ensure => file,
+    require => [file["/tmp/singleary1"]]
+}

data/examples/root/etc/init.d/sleeper

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# $Id: sleeper 576 2005-08-23 16:09:14Z luke $
+# $Id: sleeper 787 2006-01-08 00:02:23Z luke $
 
 script=$0
 path=`echo $script | sed 's/etc..*/bin/'`
@@ -15,7 +15,8 @@ fi
 
 function start
 {
-    sleeper
+    cd $path
+    ./sleeper
 }
 
 function stop

data/ext/emacs/puppet-mode-init.el

@@ -0,0 +1,6 @@
+;;
+;; Setup puppet-mode for autoloading
+;;
+(autoload 'puppet-mode "puppet-mode" "Major mode for editing puppet manifests")
+
+(add-to-list 'auto-mode-alist '("\\.pp$" . puppet-mode))

data/ext/emacs/puppet-mode.el

@@ -0,0 +1,189 @@
+;;;
+;;; puppet-mode.el
+;;; 
+;;; Author: lutter
+;;; Description: A simple mode for editing puppet manifests
+;;;
+
+(defconst puppet-mode-version "0.0.1")
+
+(defvar puppet-mode-abbrev-table nil
+  "Abbrev table in use in puppet-mode buffers.")
+
+(define-abbrev-table 'puppet-mode-abbrev-table ())
+
+(defvar puppet-mode-map nil "Keymap used in puppet mode.")
+
+(if puppet-mode-map
+    nil
+   (setq puppet-mode-map (make-sparse-keymap))
+;;   (define-key puppet-mode-map "{" 'puppet-electric-brace)
+;;   (define-key puppet-mode-map "}" 'puppet-electric-brace)
+;;   (define-key puppet-mode-map "\e\C-a" 'puppet-beginning-of-defun)
+;;   (define-key puppet-mode-map "\e\C-e" 'puppet-end-of-defun)
+;;   (define-key puppet-mode-map "\e\C-b" 'puppet-backward-sexp)
+;;   (define-key puppet-mode-map "\e\C-f" 'puppet-forward-sexp)
+;;   (define-key puppet-mode-map "\e\C-p" 'puppet-beginning-of-block)
+;;   (define-key puppet-mode-map "\e\C-n" 'puppet-end-of-block)
+;;   (define-key puppet-mode-map "\e\C-h" 'puppet-mark-defun)
+;;   (define-key puppet-mode-map "\e\C-q" 'puppet-indent-exp)
+;;   (define-key puppet-mode-map "\t" 'puppet-indent-command)
+;;   (define-key puppet-mode-map "\C-c\C-e" 'puppet-insert-end)
+;;   (define-key puppet-mode-map "\C-j" 'puppet-reindent-then-newline-and-indent)
+  (define-key puppet-mode-map "\C-m" 'newline))
+
+(defvar puppet-mode-syntax-table nil
+  "Syntax table in use in puppet-mode buffers.")
+
+(if puppet-mode-syntax-table
+    ()
+  (setq puppet-mode-syntax-table (make-syntax-table))
+  (modify-syntax-entry ?\' "\"" puppet-mode-syntax-table)
+  (modify-syntax-entry ?\" "\"" puppet-mode-syntax-table)
+  (modify-syntax-entry ?# "<" puppet-mode-syntax-table)
+  (modify-syntax-entry ?\n ">" puppet-mode-syntax-table)
+  (modify-syntax-entry ?\\ "\\" puppet-mode-syntax-table)
+  (modify-syntax-entry ?$ "." puppet-mode-syntax-table)
+  (modify-syntax-entry ?- "_" puppet-mode-syntax-table)
+  (modify-syntax-entry ?> "." puppet-mode-syntax-table)
+  (modify-syntax-entry ?= "." puppet-mode-syntax-table)
+  (modify-syntax-entry ?\; "." puppet-mode-syntax-table)
+  (modify-syntax-entry ?\( "()" puppet-mode-syntax-table)
+  (modify-syntax-entry ?\) ")(" puppet-mode-syntax-table)
+  (modify-syntax-entry ?\{ "(}" puppet-mode-syntax-table)
+  (modify-syntax-entry ?\} "){" puppet-mode-syntax-table)
+  (modify-syntax-entry ?\[ "(]" puppet-mode-syntax-table)
+  (modify-syntax-entry ?\] ")[" puppet-mode-syntax-table)
+  )
+
+(defcustom puppet-indent-tabs-mode nil
+  "*Indentation can insert tabs in puppet mode if this is non-nil."
+  :type 'boolean :group 'puppet)
+
+(defcustom puppet-comment-column 32
+  "*Indentation column of comments."
+  :type 'integer :group 'puppet)
+
+(defun puppet-mode-variables ()
+  (set-syntax-table puppet-mode-syntax-table)
+  (setq local-abbrev-table puppet-mode-abbrev-table)
+  ;(make-local-variable 'indent-line-function)
+  ;(setq indent-line-function 'ruby-indent-line)
+  (make-local-variable 'require-final-newline)
+  (setq require-final-newline t)
+  (make-variable-buffer-local 'comment-start)
+  (setq comment-start "# ")
+  (make-variable-buffer-local 'comment-end)
+  (setq comment-end "")
+  (make-variable-buffer-local 'comment-column)
+  (setq comment-column puppet-comment-column)
+  (make-variable-buffer-local 'comment-start-skip)
+  (setq comment-start-skip "#+ *")
+  (setq indent-tabs-mode puppet-indent-tabs-mode)
+  (make-local-variable 'parse-sexp-ignore-comments)
+  (setq parse-sexp-ignore-comments t)
+  (make-local-variable 'paragraph-start)
+  (setq paragraph-start (concat "$\\|" page-delimiter))
+  (make-local-variable 'paragraph-separate)
+  (setq paragraph-separate paragraph-start)
+  (make-local-variable 'paragraph-ignore-fill-prefix)
+  (setq paragraph-ignore-fill-prefix t))
+
+;;;###autoload
+(defun puppet-mode ()
+  "Major mode for editing puppet manifests.
+
+The variable puppet-indent-level controls the amount of indentation.
+\\{puppet-mode-map}"
+  (interactive)
+  (kill-all-local-variables)
+  (use-local-map puppet-mode-map)
+  (setq mode-name "Puppet")
+  (setq major-mode 'puppet-mode)
+  (puppet-mode-variables)
+
+  (run-hooks 'puppet-mode-hook))
+
+(cond
+ ((featurep 'font-lock)
+  (or (boundp 'font-lock-variable-name-face)
+      (setq font-lock-variable-name-face font-lock-type-face))
+
+  (setq puppet-font-lock-syntactic-keywords
+	'(
+	  ("\\(^\\|[=(,~?:;]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
+	   (4 (7 . ?/))
+	   (6 (7 . ?/)))
+	  ("^\\(=\\)begin\\(\\s \\|$\\)" 1 (7 . nil))
+	  ("^\\(=\\)end\\(\\s \\|$\\)" 1 (7 . nil))))
+
+  (cond ((featurep 'xemacs)
+	 (put 'puppet-mode 'font-lock-defaults
+	      '((puppet-font-lock-keywords)
+		nil nil nil
+		beginning-of-line
+		(font-lock-syntactic-keywords
+		 . puppet-font-lock-syntactic-keywords))))
+	(t
+	 (add-hook 'puppet-mode-hook
+	    '(lambda ()
+	       (make-local-variable 'font-lock-defaults)
+	       (make-local-variable 'font-lock-keywords)
+	       (make-local-variable 'font-lock-syntax-table)
+	       (make-local-variable 'font-lock-syntactic-keywords)
+	       (setq font-lock-defaults '((puppet-font-lock-keywords) nil nil))
+	       (setq font-lock-keywords puppet-font-lock-keywords)
+	       (setq font-lock-syntax-table puppet-font-lock-syntax-table)
+	       (setq font-lock-syntactic-keywords puppet-font-lock-syntactic-keywords)))))
+
+  (defvar puppet-font-lock-syntax-table
+    (let* ((tbl (copy-syntax-table puppet-mode-syntax-table)))
+      (modify-syntax-entry ?_ "w" tbl)
+      tbl))
+
+  (defvar puppet-font-lock-keywords
+    (list
+     ;; defines
+     '("^\\s *\\(define\\|node\\|class\\)\\s +\\([^( \t\n]+\\)"
+       2 font-lock-function-name-face)
+     ;; include
+     '("^\\s *include\\s +\\([^( \t\n]+\\)"
+       1 font-lock-reference-face)
+     ;; keywords
+     (cons (concat
+	    "\\b\\(\\("
+	    (mapconcat
+	     'identity
+	     '("case"
+               "class"
+               "default"
+               "define"
+	       "false"
+	       "import"
+	       "include"
+	       "inherits"
+	       "node"
+	       "true"
+	       )
+	     "\\|")
+	    "\\)\\>\\)")
+	   1)
+     ;; variables
+     '("\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(nil\\|self\\|true\\|false\\)\\>"
+       2 font-lock-variable-name-face)
+     ;; variables
+     '("\\(\\$\\([^a-zA-Z0-9 \n]\\|[0-9]\\)\\)\\W"
+       1 font-lock-variable-name-face)
+     '("\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\)+"
+       0 font-lock-variable-name-face)
+     ;; usage of types
+     '("^\\s +\\([a-zA-Z-]+\\)\\s +{" 
+       1 font-lock-type-face)
+     ;; general delimited string
+     '("\\(^\\|[[ \t\n<+(,=]\\)\\(%[xrqQwW]?\\([^<[{(a-zA-Z0-9 \n]\\)[^\n\\\\]*\\(\\\\.[^\n\\\\]*\\)*\\(\\3\\)\\)"
+       (2 font-lock-string-face))
+     )
+    "*Additional expressions to highlight in puppet mode."))
+ )
+
+(provide 'puppet-mode)

data/ext/ldap/puppet.schema

@@ -0,0 +1,17 @@
+# These OIDs are all fake.  No guarantees there won't be conflicts.
+#
+# $Id: puppet.schema 876 2006-02-08 01:06:30Z luke $
+
+attributetype ( 1.1.2.10 NAME 'puppetclass'
+	DESC 'Puppet Node Class'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.1.2.9 NAME 'parentnode'
+	DESC 'Puppet Parent Node'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+objectclass ( 1.1.1.1 NAME 'puppetClient' SUP ipHost AUXILIARY
+	DESC 'Puppet Client objectclass'
+	MAY ( puppetclass $ parentnode ))

data/ext/{module:puppet → module_puppet}

@@ -7,9 +7,8 @@
 #
 # = Usage
 #
-#   puppet [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
-#               [-l|--logfile <file>] [-p|--parse-only] <file>
-#               [-c|--confdir <configuration directory>] [--vardir <var directory>]
+#   puppet_module [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
+#               [-l|--logdest <file>]<file>
 #
 # = Description
 #
@@ -19,9 +18,11 @@
 #
 # = Options
 #
-# confdir::
-#   The configuration root directory, where +puppetmasterd+ defaults to looking
-#   for all of its configuration files.  Defaults to +/etc/puppet+.
+# Note that any configuration parameter that's valid in the configuration file
+# is also a valid long argument.  For example, 'ssldir' is a valid configuration
+# parameter, so you can specify '--ssldir <directory>' as an argument.
+#
+# See the configuration file for the full list of acceptable parameters.
 #
 # debug::
 #   Enable full debugging.
@@ -29,17 +30,10 @@
 # help::
 #   Print this help message
 #
-# logfile::
+# logdest::
 #   Where to send messages.  Choose between syslog, the console, and a log file.
 #   Defaults to sending messages to the console.
 #
-# parse-only::
-#   Just verify syntax, do not apply anything.
-#
-# vardir::
-#   The variable-size directory, used for storing state.  Defaults to
-#   /var/puppet.
-#
 # verbose::
 #   Print extra information.
 #
@@ -65,18 +59,19 @@ rescue LoadError
     $haveusage = false
 end
 
-result = GetoptLong.new(
-	[ "--confdir",	"-c",			GetoptLong::REQUIRED_ARGUMENT ],
+options = [
     [ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
     [ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
     [ "--logdest",	"-l",			GetoptLong::REQUIRED_ARGUMENT ],
     [ "--verbose",  "-v",			GetoptLong::NO_ARGUMENT ],
-    [ "--noop",     "-n",			GetoptLong::NO_ARGUMENT ],
     [ "--use-nodes",    			GetoptLong::NO_ARGUMENT ],
-    [ "--parse-only",  "-p",		GetoptLong::NO_ARGUMENT ],
-	[ "--vardir",	    			GetoptLong::REQUIRED_ARGUMENT ],
     [ "--version",  "-V",           GetoptLong::NO_ARGUMENT ]
-)
+]
+
+# Add all of the config parameters as valid options.
+Puppet.config.addargs(options)
+
+result = GetoptLong.new(*options)
 
 debug = false
 verbose = false
@@ -95,8 +90,6 @@ master = {
 begin
     result.each { |opt,arg|
         case opt
-            when "--confdir"
-                Puppet[:puppetconf] = arg
             when "--version"
                 puts "%s" % Puppet.version
                 exit
@@ -107,24 +100,20 @@ begin
                     puts "No help available unless you have RDoc::usage installed"
                     exit
                 end
-            when "--noop"
-                Puppet[:noop] = true
             when "--use-nodes"
                 master[:UseNodes] = true
             when "--verbose"
                 verbose = true
-            when "--parse-only"
-                parseonly = true
             when "--debug"
                 debug = true
             when "--logdest"
                 begin
-                    Puppet[:logdest] = arg
+                    Puppet::Log.newdestination arg
                 rescue => detail
                     $stderr.puts detail.to_s
                 end
-            when "--vardir"
-                Puppet[:puppetvar] = arg
+            else
+                Puppet.config.handlearg(opt, arg)
         end
     }
 rescue GetoptLong::InvalidOption => detail
@@ -136,11 +125,21 @@ rescue GetoptLong::InvalidOption => detail
 end
 
 if debug
-    Puppet[:loglevel] = :debug
+    Puppet::Log.level = :debug
+    Puppet::Log.newdestination :console
 elsif verbose
-    Puppet[:loglevel] = :info
+    Puppet::Log.level = :info
+    Puppet::Log.newdestination :console
+end
+
+# Now parse the config
+if Puppet[:config] and File.exists? Puppet[:config]
+    Puppet.config.parse(Puppet[:config])
 end
 
+Puppet.genconfig
+Puppet.genmanifest
+
 unless ARGV.length > 0
     $stderr.puts "You must pass a script to parse"
     exit(14)