puppet 0.24.6 → 0.24.7

data/examples/mcx_dock_invalid.pp

@@ -0,0 +1,9 @@
+# Mac MCX Test
+
+computer { "localhost": }
+
+mcx {
+  "/Groups/mcx_dock":
+    ensure  => "present",
+    content => 'invalid plist'
+}

data/examples/mcx_nogroup.pp

@@ -0,0 +1,118 @@
+mcx { '/Groups/doesnotexist':
+    ensure => 'present',
+    content => '<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.dock</key>
+	<dict>
+		<key>AppItems-Raw</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>upk</key>
+			<dict>
+				<key>mcx_input_key_names</key>
+				<array>
+					<string>AppItems-Raw</string>
+				</array>
+				<key>mcx_output_key_name</key>
+				<string>static-apps</string>
+				<key>mcx_remove_duplicates</key>
+				<true/>
+			</dict>
+			<key>value</key>
+			<array>
+				<dict>
+					<key>mcx_typehint</key>
+					<integer>1</integer>
+					<key>tile-data</key>
+					<dict>
+						<key>file-data</key>
+						<dict>
+							<key>_CFURLString</key>
+							<string>/Applications/Mail.app</string>
+							<key>_CFURLStringType</key>
+							<integer>0</integer>
+						</dict>
+						<key>file-label</key>
+						<string>Mail</string>
+					</dict>
+					<key>tile-type</key>
+					<string>file-tile</string>
+				</dict>
+				<dict>
+					<key>mcx_typehint</key>
+					<integer>1</integer>
+					<key>tile-data</key>
+					<dict>
+						<key>file-data</key>
+						<dict>
+							<key>_CFURLString</key>
+							<string>/Applications/Safari.app</string>
+							<key>_CFURLStringType</key>
+							<integer>0</integer>
+						</dict>
+						<key>file-label</key>
+						<string>Safari</string>
+					</dict>
+					<key>tile-type</key>
+					<string>file-tile</string>
+				</dict>
+			</array>
+		</dict>
+		<key>DocItems-Raw</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>upk</key>
+			<dict>
+				<key>mcx_input_key_names</key>
+				<array>
+					<string>DocItems-Raw</string>
+				</array>
+				<key>mcx_output_key_name</key>
+				<string>static-others</string>
+				<key>mcx_remove_duplicates</key>
+				<true/>
+			</dict>
+			<key>value</key>
+			<array/>
+		</dict>
+		<key>MCXDockSpecialFolders-Raw</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>upk</key>
+			<dict>
+				<key>mcx_input_key_names</key>
+				<array>
+					<string>MCXDockSpecialFolders-Raw</string>
+				</array>
+				<key>mcx_output_key_name</key>
+				<string>MCXDockSpecialFolders</string>
+				<key>mcx_remove_duplicates</key>
+				<true/>
+			</dict>
+			<key>value</key>
+			<array/>
+		</dict>
+		<key>contents-immutable</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>value</key>
+			<false/>
+		</dict>
+		<key>static-only</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>value</key>
+			<false/>
+		</dict>
+	</dict>
+</dict>
+</plist>
+'
+}

data/examples/mcx_notexists_absent.pp

@@ -0,0 +1,4 @@
+mcx { '/Groups/foobar':
+    ensure => 'absent',
+    content => 'absent'
+}

data/ext/emacs/puppet-mode.el

@@ -226,7 +226,7 @@ of the initial include plus puppet-include-indent."
              ;; Semicolon ends a block for a resource when multiple resources
              ;; are defined in the same block, but try not to get the case of
              ;; a complete resource on a single line wrong.
-             ((looking-at "^\\([^'\":\n]\\|\"[^\n\"]*\"\\|'[^\n']'\\)**;\\s-*$")
+             ((looking-at "^\\([^'\":\n]\\|\"[^\n\"]*\"\\|'[^\n']*'\\)*;\\s-*$")
               (setq cur-indent (- (current-indentation) puppet-indent-level))
               (setq not-indented nil))
 

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.6'
+    PUPPETVERSION = '0.24.7'
 
     def Puppet.version
         return PUPPETVERSION

data/lib/puppet/external/nagios/base.rb

@@ -196,6 +196,9 @@ class Nagios::Base
         args.each { |param,value|
             self[param] = value
         }
+        if @namevar == :_naginator_name
+          self['_naginator_name'] = self['name']
+        end
     end
 
     # Handle parameters like attributes.
@@ -321,115 +324,155 @@ class Nagios::Base
     end
 
     # object types
-    newtype :command do
-        setparameters :command_name, :command_line
+    newtype :host do
+        setparameters :host_name, :alias, :display_name, :address, :parents,
+            :hostgroups, :check_command, :initial_state, :max_check_attempts,
+            :check_interval, :retry_interval, :active_checks_enabled,
+            :passive_checks_enabled, :check_period, :obsess_over_host,
+            :check_freshness, :freshness_threshold, :event_handler,
+            :event_handler_enabled, :low_flap_threshold, :high_flap_threshold,
+            :flap_detection_enabled, :flap_detection_options,
+            :failure_prediction_enabled, :process_perf_data,
+            :retain_status_information, :retain_nonstatus_information, :contacts,
+            :contact_groups, :notification_interval, :first_notification_delay,
+            :notification_period, :notification_options, :notifications_enabled,
+            :stalking_options, :notes, :notes_url, :action_url, :icon_image,
+            :icon_image_alt, :vrml_image, :statusmap_image, "2d_coords".intern,
+            "3d_coords".intern,
+            :register, :use
+
+        setsuperior "person"
+        map :address => "ipHostNumber"
     end
 
-    newtype :contact do
-        setparameters :contact_name, :alias, :host_notification_period,
-            :host_notification_commands, :service_notification_period,
-            :service_notification_commands, :register, :email, :pager, 
-            :service_notification_options, :host_notification_options
+    newtype :hostgroup do
+      setparameters :hostgroup_name, :alias, :members, :hostgroup_members, :notes,
+          :notes_url, :action_url,
+          :register, :use
+    end
 
-        setsuperior "person"
+    newtype :service do
+        attach :host => :host_name
+        setparameters :host_name, :hostgroup_name, :service_description,
+            :display_name, :servicegroups, :is_volatile, :check_command,
+            :initial_state, :max_check_attempts, :check_interval, :retry_interval,
+            :normal_check_interval, :retry_check_interval, :active_checks_enabled,
+            :passive_checks_enabled, :parallelize_check, :check_period,
+            :obsess_over_service, :check_freshness, :freshness_threshold,
+            :event_handler, :event_handler_enabled, :low_flap_threshold,
+            :high_flap_threshold, :flap_detection_enabled,:flap_detection_options,
+            :process_perf_data, :failure_prediction_enabled, :retain_status_information,
+            :retain_nonstatus_information, :notification_interval,
+            :first_notification_delay, :notification_period, :notification_options,
+            :notifications_enabled, :contacts, :contact_groups, :stalking_options,
+            :notes, :notes_url, :action_url, :icon_image, :icon_image_alt,
+            :register, :use,
+            :_naginator_name
+
+        suppress :host_name
+
+        setnamevar :_naginator_name
     end
 
-    newtype :contactgroup do
-        setparameters :contactgroup_name, :alias, :members
+    newtype :servicegroup do
+        setparameters :servicegroup_name, :alias, :members, :servicegroup_members,
+            :notes, :notes_url, :action_url,
+            :register, :use
     end
 
-    newtype :host do
-        setparameters :host_name, :notifications_enabled, :event_handler_enabled,
-            :flap_detection_enabled, :process_perf_data, :retain_status_information,
-            :retain_nonstatus_information, :register, :use, :alias,
-            :address, :check_command, :max_check_attempts, :notification_interval,
-            :notification_period, :notification_options, :checks_enabled,
-            :failure_prediction_enabled, :parents, :contact_groups
+    newtype :contact do
+        setparameters :contact_name, :alias, :contactgroups,
+            :host_notifications_enabled, :service_notifications_enabled,
+            :host_notification_period, :service_notification_period,
+            :host_notification_options, :service_notification_options,
+            :host_notification_commands, :service_notification_commands,
+            :email, :pager, :address1, :address2, :address3, :address4,
+            :address5, :address6, :can_submit_commands, :retain_status_information,
+            :retain_nonstatus_information,
+            :register, :use
 
         setsuperior "person"
-        map :address => "ipHostNumber"
     end
 
-    newtype :hostextinfo do
-        auxiliary = true
-        setparameters :host_name, :notes_url, :icon_image, :icon_image_alt, :vrml_image,
-            "2d_coords".intern, "3d_coords".intern
-
-        setnamevar :host_name
+    newtype :contactgroup do
+        setparameters :contactgroup_name, :alias, :members, :contactgroup_members,
+            :register, :use
     end
 
-    newtype :hostgroup do
-        setparameters :hostgroup_name, :alias, :contact_groups, :members
+    # TODO - We should support generic time periods here eg "day 1 - 15"
+    newtype :timeperiod do
+        setparameters :timeperiod_name, :alias, :sunday, :monday, :tuesday,
+            :wednesday, :thursday, :friday, :saturday, :exclude,
+            :register, :use
     end
 
-    newtype :hostescalation do
-        setparameters :name, :first_notification, :last_notification,
-            :notification_interval, :contact_groups,
-            :escalation_options, :register, :hostgroup_name
-        setnamevar :name
-    end              
+    newtype :command do
+        setparameters :command_name, :command_line
+    end
 
-    newtype :hostgroupescalation do
+    newtype :servicedependency do
         auxiliary = true
-        setparameters :hostgroup_name, :first_notification, :last_notification,
-            :contact_groups, :notification_interval
+        setparameters :dependent_host_name, :dependent_hostgroup_name,
+            :dependent_service_description, :host_name, :hostgroup_name,
+            :service_description, :inherits_parent, :execution_failure_criteria,
+            :notification_failure_criteria, :dependency_period,
+            :register, :use,
+            :_naginator_name
 
-        setnamevar :hostgroup_name
+        setnamevar :_naginator_name
     end
 
-    newtype :service do
-        attach :host => :host_name
-        setparameters :name, :active_checks_enabled, :passive_checks_enabled,
-            :parallelize_check, :obsess_over_service, :check_freshness,
-            :notifications_enabled, :event_handler_enabled,
-            :flap_detection_enabled, :process_perf_data,
-            :retain_status_information, :retain_nonstatus_information, :register,
-            :is_volatile, :check_period, :max_check_attempts,
-            :normal_check_interval, :retry_check_interval, :contact_groups,
-            :notification_interval, :notification_period, :notification_options,
-            :service_description, :host_name, :freshness_threshold,
-            :check_command, :hostgroup_name, :event_handler, :servicegroups, :host
-
-        suppress :host_name
+    newtype :serviceescalation do
+        setparameters :host_name, :hostgroup_name, :service_description, :contacts,
+            :contact_groups, :first_notification, :last_notification,
+            :notification_interval, :escalation_period, :escalation_options,
+            :register, :use,
+            :_naginator_name
 
-        setnamevar :service_description
+        setnamevar :_naginator_name
     end
 
-    newtype :servicedependency do
-        auxiliary = true
-        setparameters :host_name, :service_description, :dependent_host_name,
-            :dependent_service_description, :execution_failure_criteria,
-            :notification_failure_criteria, :hostgroup_name, 
-            :dependent_hostgroup_name
+    newtype :hostdependency do
+      auxiliary = true
+      setparameters :dependent_host_name, :dependent_hostgroup_name, :host_name,
+          :hostgroup_name, :inherits_parent, :execution_failure_criteria,
+          :notification_failure_criteria, :dependency_period,
+          :register, :use,
+          :_naginator_name
 
-        setnamevar :host_name
+      setnamevar :_naginator_name
     end
 
-    newtype :serviceescalation do
-        setparameters :host_name, :service_description, :first_notification,
-            :last_notification, :contact_groups, :notification_interval, :hostgroup_name
+    newtype :hostescalation do
+        setparameters :host_name, :hostgroup_name, :contacts, :contact_groups,
+            :first_notification, :last_notification, :notification_interval,
+            :escalation_period, :escalation_options,
+            :register, :use,
+            :_naginator_name
 
-        setnamevar :host_name
+        setnamevar :_naginator_name
     end
 
-    newtype :servicegroup do
-        setparameters :servicegroup_name, :alias
+    newtype :hostextinfo do
+        auxiliary = true
+        setparameters :host_name, :notes, :notes_url, :icon_image, :icon_image_alt,
+            :vrml_image, :statusmap_image, "2d_coords".intern, "3d_coords".intern,
+            :register, :use
 
-        setnamevar :servicegroup_name
+        setnamevar :host_name
     end
 
     newtype :serviceextinfo do
         auxiliary = true
 
-        setparameters :host_name, :service_description, :icon_image, :icon_image_alt
+        setparameters :host_name, :service_description, :notes, :notes_url,
+            :action_url, :icon_image, :icon_image_alt,
+            :register, :use,
+            :_naginator_name
 
-        setnamevar :host_name
+        setnamevar :_naginator_name
     end
 
-    newtype :timeperiod do
-        setparameters :timeperiod_name, :alias, :sunday, :monday, :tuesday,
-            :wednesday, :thursday, :friday, :saturday
-    end
 end
 
 # $Id$

data/lib/puppet/feature/base.rb

@@ -22,3 +22,9 @@ Puppet.features.add(:mongrel, :libs => %w{rubygems mongrel puppet/network/http_s
 
 # We have lcs diff
 Puppet.features.add :diff, :libs => %w{diff/lcs diff/lcs/hunk}
+
+# We have augeas
+Puppet.features.add(:augeas, :libs => ["augeas"])
+
+# We have RRD available
+Puppet.features.add(:rrd, :libs => ["RRDtool"])

data/lib/puppet/indirector/yaml.rb

@@ -1,17 +1,26 @@
 require 'puppet/indirector/terminus'
+require 'puppet/util/file_locking'
 
 # The base class for YAML indirection termini.
 class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
+    include Puppet::Util::FileLocking
+
     # Read a given name's file in and convert it from YAML.
     def find(request)
         file = path(request.key)
         return nil unless FileTest.exist?(file)
 
+        yaml = nil
         begin
-            return from_yaml(File.read(file))
+            readlock(file) { |fh| yaml = fh.read }
         rescue => detail
             raise Puppet::Error, "Could not read YAML data for %s %s: %s" % [indirection.name, request.key, detail]
         end
+        begin
+            return from_yaml(yaml)
+        rescue => detail
+            raise Puppet::Error, "Could not parse YAML data for %s %s: %s" % [indirection.name, request.key, detail]
+        end
     end
 
     # Convert our object to YAML and store it to the disk.
@@ -28,7 +37,7 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
         end
 
         begin
-            File.open(file, "w", 0660) { |f| f.print to_yaml(request.instance) }
+            writelock(file, 0660) { |f| f.print to_yaml(request.instance) }
         rescue TypeError => detail
             Puppet.err "Could not save %s %s: %s" % [self.name, request.key, detail]
         end
@@ -36,7 +45,7 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
 
     # Get the yaml directory
     def base
-      (Puppet[:name] == "puppetmasterd") ? Puppet[:yamldir] : Puppet[:clientyamldir]
+        (Puppet[:name] == "puppetmasterd") ? Puppet[:yamldir] : Puppet[:clientyamldir]
     end
 
     # Return the path to a given node's file.

data/lib/puppet/module.rb

@@ -24,7 +24,7 @@ class Puppet::Module
     def self.templatepath(environment = nil)
         dirs = Puppet.settings.value(:templatedir, environment).split(":")
         dirs.select do |p|
-            p =~ /^#{File::SEPARATOR}/ && File::directory?(p)
+            File::directory?(p)
         end
     end