puppet 0.24.9 → 0.25.0

data/lib/puppet/provider/service/smf.rb

@@ -6,13 +6,31 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
     only support for starting and stopping services, which also enables and
     disables them, respectively.
 
-  "
+    By specifying manifest => \"/path/to/service.xml\", the SMF manifest will
+    be imported if it does not exist.
+
+    "
 
     defaultfor :operatingsystem => :solaris
 
     confine :operatingsystem => :solaris
 
     commands :adm => "/usr/sbin/svcadm", :svcs => "/usr/bin/svcs"
+    commands :svccfg => "/usr/sbin/svccfg"
+
+    def setupservice
+        begin
+            if resource[:manifest]
+                [command(:svcs), "-l", @resource[:name]]
+                if $?.exitstatus == 1
+                    Puppet.notice "Importing %s for %s" % [ @resource[:manifest], @resource[:name] ]
+                    svccfg :import, resource[:manifest]
+                end
+            end
+        rescue Puppet::ExecutionFailure => detail
+            raise Puppet::Error.new( "Cannot config %s to enable it: %s" % [ self.service, detail ] )
+        end
+    end
 
     def enable
         self.start
@@ -20,7 +38,7 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
 
     def enabled?
         case self.status
-        when :running:
+        when :running
             return :true
         else
             return :false
@@ -36,7 +54,13 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
     end
 
     def startcmd
-        [command(:adm), :enable, @resource[:name]]
+        self.setupservice
+        case self.status
+        when :stopped
+            [command(:adm), :enable, @resource[:name]]
+        when :maintenance
+            [command(:adm), :clear, @resource[:name]]
+        end
     end
 
     def status
@@ -44,42 +68,33 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
             super
             return
         end
+
         begin
-            output = svcs "-l", @resource[:name]
+            state = svcs("-H", "-o", "state", @resource[:name]).chomp
         rescue Puppet::ExecutionFailure
-            warning "Could not get status on service %s" % self.name
+            info "Could not get status on service %s" % self.name
             return :stopped
         end
 
-        output.split("\n").each { |line|
-            var = nil
-            value = nil
-            if line =~ /^(\w+)\s+(.+)/
-                var = $1
-                value = $2
-            else
-                Puppet.err "Could not match %s" % line.inspect
-                next
-            end
-            case var
-            when "state":
-                case value
-                when "online":
-                    #self.warning "matched running %s" % line.inspect
-                    return :running
-                when "offline", "disabled", "uninitialized"
-                    #self.warning "matched stopped %s" % line.inspect
-                    return :stopped
-                when "legacy_run":
-                    raise Puppet::Error,
-                        "Cannot manage legacy services through SMF"
-                else
-                    raise Puppet::Error,
-                        "Unmanageable state '%s' on service %s" %
-                        [value, self.name]
-                end
-            end
-        }
+
+        case state
+        when "online"
+            #self.warning "matched running %s" % line.inspect
+            return :running
+        when "offline", "disabled", "uninitialized"
+            #self.warning "matched stopped %s" % line.inspect
+            return :stopped
+        when "maintenance"
+            return :maintenance
+        when "legacy_run"
+            raise Puppet::Error,
+              "Cannot manage legacy services through SMF"
+        else
+            raise Puppet::Error,
+              "Unmanageable state '%s' on service %s" %
+              [state, self.name]
+        end
+
     end
 
     def stopcmd

data/lib/puppet/provider/ssh_authorized_key/parsed.rb

@@ -66,6 +66,40 @@ Puppet::Type.type(:ssh_authorized_key).provide(:parsed,
         end
     end
 
+    def target
+        if user
+            File.expand_path("~%s/.ssh/authorized_keys" % user)
+        elsif target = @resource.should(:target)
+            target
+        end
+    end
+
+    def user
+        @resource.should(:user)
+    end
+
+    def dir_perm
+        # Determine correct permission for created directory and file
+        # we can afford more restrictive permissions when the user is known
+        if target
+            if user
+                0700
+            else
+                0755
+            end
+        end
+    end
+
+    def file_perm
+        if target
+            if user
+                0600
+            else
+                0644
+            end
+        end
+    end
+
     def flush
         # As path expansion had to be moved in the provider, we cannot generate new file
         # resources and thus have to chown and chmod here. It smells hackish.

data/lib/puppet/provider/sshkey/parsed.rb

@@ -2,7 +2,7 @@ require 'puppet/provider/parsedfile'
 
 known = nil
 case Facter.value(:operatingsystem)
-when "Darwin": known = "/etc/ssh_known_hosts"
+when "Darwin"; known = "/etc/ssh_known_hosts"
 else
     known = "/etc/ssh/ssh_known_hosts"
 end
@@ -28,7 +28,7 @@ Puppet::Type.type(:sshkey).provide(:parsed,
         :pre_gen => proc { |hash|
             if hash[:alias]
                 names = [hash[:name], hash[:alias]].flatten
-                
+
                 hash[:name] = [hash[:name], hash[:alias]].flatten.join(",")
                 hash.delete(:alias)
             end

data/lib/puppet/provider/user/directoryservice.rb

@@ -20,15 +20,15 @@ Puppet::Type.type(:user).provide :directoryservice, :parent => Puppet::Provider:
     commands :dscl => "/usr/bin/dscl"
     confine :operatingsystem => :darwin
     defaultfor :operatingsystem => :darwin
-    
+
     # JJM: DirectoryService can manage passwords.
     #      This needs to be a special option to dscl though (-passwd)
     has_feature :manages_passwords
-    
+
     # JJM: comment matches up with the /etc/passwd concept of an user
     options :comment, :key => "realname"
     options :password, :key => "passwd"
-    
+
     autogen_defaults :home => "/var/empty", :shell => "/usr/bin/false"
 
     verify :gid, "GID must be an integer" do |value|
@@ -38,32 +38,15 @@ Puppet::Type.type(:user).provide :directoryservice, :parent => Puppet::Provider:
     verify :uid, "UID must be an integer" do |value|
         value.is_a? Integer
     end
-    
+
     def autogen_comment
         return @resource[:name].capitalize
     end
-    
-    # The list of all groups the user is a member of.  Different
-    # user mgmt systems will need to override this method.
+
+    # The list of all groups the user is a member of.
     # JJM: FIXME: Override this method...
     def groups
         groups = []
-
-        # user = @resource[:name]
-        # # Retrieve them all from netinfo
-        # open("| #{command(:nireport)} / /groups name users") do |file|
-        #     file.each do |line|
-        #         name, members = line.split(/\s+/)
-        #         next unless members
-        #         next if members =~ /NoValue/
-        #         members = members.split(",")
-        # 
-        #         if members.include? user
-        #             groups << name
-        #         end
-        #     end
-        # end
-
         groups.join(",")
     end
 
@@ -71,7 +54,7 @@ Puppet::Type.type(:user).provide :directoryservice, :parent => Puppet::Provider:
     # of the groups and add us to them.
     def groups=(groups)
         # case groups
-        # when Fixnum:
+        # when Fixnum
         #     groups = [groups.to_s]
         # when String
         #     groups = groups.split(/\s*,\s*/)
@@ -80,12 +63,12 @@ Puppet::Type.type(:user).provide :directoryservice, :parent => Puppet::Provider:
         # end
         # # Get just the groups we need to modify
         # diff = groups - (@is || [])
-        # 
+        #
         # data = {}
         # open("| #{command(:nireport)} / /groups name users") do |file|
         #     file.each do |line|
         #         name, members = line.split(/\s+/)
-        # 
+        #
         #         if members.nil? or members =~ /NoValue/
         #             data[name] = []
         #         else
@@ -94,7 +77,7 @@ Puppet::Type.type(:user).provide :directoryservice, :parent => Puppet::Provider:
         #         end
         #     end
         # end
-        # 
+        #
         # user = @resource[:name]
         # data.each do |name, members|
         #     if members.include? user and groups.include? name
@@ -112,6 +95,6 @@ Puppet::Type.type(:user).provide :directoryservice, :parent => Puppet::Provider:
         #     end
         # end
     end
-    
-    
+
+
 end

data/lib/puppet/provider/user/hpux.rb

@@ -3,7 +3,7 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
 
     defaultfor :operatingsystem => "hp-ux"
     confine :operatingsystem => "hp-ux"
-    
+
     commands :modify => "/usr/sam/lbin/usermod.sam", :delete => "/usr/sam/lbin/userdel.sam", :add => "/usr/sbin/useradd"
     options :comment, :method => :gecos
     options :groups, :flag => "-G"
@@ -20,11 +20,11 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
     has_features :manages_homedir, :allows_duplicates
 
     def deletecmd
-	super.insert(1,"-F")
+        super.insert(1,"-F")
     end
 
     def modifycmd(param,value)
-	super.insert(1,"-F")
+        super.insert(1,"-F")
     end
 
 end

data/lib/puppet/provider/user/ldap.rb

@@ -6,7 +6,7 @@ Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do
         including ``ldapbase``.  You will also almost definitely need settings
         for ``ldapuser`` and ``ldappassword``, so that your clients can write
         to ldap.
-        
+
         Note that this provider will automatically generate a UID for you if
         you do not specify one, but it is a potentially expensive operation,
         as it iterates across all existing users to pick the appropriate next
@@ -33,7 +33,7 @@ Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do
 
     # Find the next uid after the current largest uid.
     provider = self
-    manager.generates(:uidNumber).with do 
+    manager.generates(:uidNumber).with do
         largest = 500
         if existing = provider.manager.search
             existing.each do |hash|

data/lib/puppet/provider/zfs/solaris.rb

@@ -19,7 +19,7 @@ Puppet::Type.type(:zfs).provide(:solaris) do
         zfs *([:create] + add_properties + [@resource[:name]])
     end
 
-    def delete
+    def destroy
         zfs(:destroy, @resource[:name])
     end
 

data/lib/puppet/provider/zone/solaris.rb

@@ -27,7 +27,7 @@ Puppet::Type.type(:zone).provide(:solaris) do
     end
 
     def self.instances
-        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com] 
+        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com]
         x = adm(:list, "-cp").split("\n").collect do |line|
             new(line2hash(line))
         end
@@ -112,12 +112,12 @@ Puppet::Type.type(:zone).provide(:solaris) do
         hash = {}
         output.split("\n").each do |line|
             case line
-            when /^(\S+):\s*$/:
+            when /^(\S+):\s*$/
                 name = $1
                 current = nil # reset it
-            when /^(\S+):\s*(.+)$/:
+            when /^(\S+):\s*(.+)$/
                 hash[$1.intern] = $2
-            when /^\s+(\S+):\s*(.+)$/:
+            when /^\s+(\S+):\s*(.+)$/
                 if name
                     unless hash.include? name
                         hash[name] = []

data/lib/puppet/provider/zpool/solaris.rb

@@ -19,9 +19,9 @@ Puppet::Type.type(:zpool).provide(:solaris) do
         pool_array.reverse.each do |value|
             sym = nil
             case value
-            when "spares": sym = :spare
-            when "logs": sym = :log
-            when "mirror", "raidz1", "raidz2":
+            when "spares"; sym = :spare
+            when "logs"; sym = :log
+            when "mirror", "raidz1", "raidz2"
                 sym = value == "mirror" ? :mirror : :raidz
                 pool[:raid_parity] = "raidz2" if value == "raidz2"
             else

data/lib/puppet/rails.rb

@@ -4,6 +4,7 @@ require 'facter'
 require 'puppet'
 
 module Puppet::Rails
+    TIME_DEBUG = true
 
     def self.connect
         # This global init does not work for testing, because we remove
@@ -21,7 +22,6 @@ module Puppet::Rails
             ActiveRecord::Base.logger.level = Logger::DEBUG
         end
 
-        ActiveRecord::Base.allow_concurrency = true
         ActiveRecord::Base.verify_active_connections!
 
         begin
@@ -31,24 +31,24 @@ module Puppet::Rails
                 puts detail.backtrace
             end
             raise Puppet::Error, "Could not connect to database: %s" % detail
-        end 
+        end
     end
 
     # The arguments for initializing the database connection.
     def self.database_arguments
         adapter = Puppet[:dbadapter]
-        
+
         args = {:adapter => adapter, :log_level => Puppet[:rails_loglevel]}
 
         case adapter
-        when "sqlite3":
+        when "sqlite3"
             args[:dbfile] = Puppet[:dblocation]
-        when "mysql", "postgresql":
+        when "mysql", "postgresql"
             args[:host]     = Puppet[:dbserver] unless Puppet[:dbserver].empty?
             args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].empty?
             args[:password] = Puppet[:dbpassword] unless Puppet[:dbpassword].empty?
             args[:database] = Puppet[:dbname]
-            
+
             socket          = Puppet[:dbsocket]
             args[:socket]   = socket unless socket.empty?
         else
@@ -93,7 +93,7 @@ module Puppet::Rails
 
         unless ActiveRecord::Base.connection.tables.include?("resources")
             raise Puppet::Error, "Database has problems, can't migrate."
-        end    
+        end
 
         Puppet.notice "Migrating"
 
@@ -122,9 +122,9 @@ module Puppet::Rails
                puts detail.backtrace
             end
             raise Puppet::Error, "Could not connect to database: %s" % detail
-        end 
+        end
 
-        ActiveRecord::Base.connection.tables.each do |t| 
+        ActiveRecord::Base.connection.tables.each do |t|
             ActiveRecord::Base.connection.drop_table t
         end
     end

data/lib/puppet/rails/benchmark.rb

@@ -0,0 +1,69 @@
+require 'benchmark'
+module Puppet::Rails::Benchmark
+    $benchmarks = {:accumulated => {}}
+
+    def time_debug?
+        Puppet::Rails::TIME_DEBUG
+    end
+
+    def railsmark(message)
+        result = nil
+        seconds = Benchmark.realtime { result = yield }
+        Puppet.debug(message + " in %0.2f seconds" % seconds)
+
+        $benchmarks[message] = seconds if time_debug?
+        result
+    end
+
+    def debug_benchmark(message)
+        unless Puppet::Rails::TIME_DEBUG
+            return yield
+        end
+
+        railsmark(message) { yield }
+    end
+
+    # Collect partial benchmarks to be logged when they're
+    # all done.
+    #   These are always low-level debugging so we only
+    # print them if time_debug is enabled.
+    def accumulate_benchmark(message, label)
+        unless time_debug?
+            return yield
+        end
+
+        $benchmarks[:accumulated][message] ||= Hash.new(0)
+        $benchmarks[:accumulated][message][label] += Benchmark.realtime { yield }
+    end
+
+    # Log the accumulated marks.
+    def log_accumulated_marks(message)
+        return unless time_debug?
+
+        if $benchmarks[:accumulated].empty? or $benchmarks[:accumulated][message].nil? or $benchmarks[:accumulated][message].empty?
+            return
+        end
+
+        $benchmarks[:accumulated][message].each do |label, value|
+            Puppet.debug(message + ("(%s)" % label) + (" in %0.2f seconds" % value))
+        end
+    end
+
+    def write_benchmarks
+        return unless time_debug?
+
+        branch = %x{git branch}.split("\n").find { |l| l =~ /^\*/ }.sub("* ", '')
+
+        file = "/tmp/time_debugging.yaml"
+
+        require 'yaml'
+
+        if FileTest.exist?(file)
+            data = YAML.load_file(file)
+        else
+            data = {}
+        end
+        data[branch] = $benchmarks
+        File.open(file, "w") { |f| f.print YAML.dump(data) }
+    end
+end