[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. 90c4a6028cf6ebd530af736ce08f1b413698b162

[Micah Anderson]

The following commit has been merged in the master branch:
commit 6fafbd3f74fd2a63f86d93d7849c4d1a9ece24d5
Author: James Turnbull <james at lovedthanlost.net>
Date:   Thu May 15 17:13:30 2008 +1000

    Fix for #1219
    
    Instead of deleting the init scripts (with --del) we should simply disable
    it with chkconfig service off, and respectfully do the same for enable
    => true;
    
    Updated CHANGELOG
    
    Fix for #1219.  Instead of deleting the init scripts (with --del) we should simply disable it with chkconfig service off, and respectfully do the same for enable
    => true;

diff --git a/CHANGELOG b/CHANGELOG
index eb223d1..a0c5a12 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,48 @@
+    Instead of deleting the init scripts (with --del) we should simply disable
+    it with chkconfig service off, and respectfully do the same for enable
+    => true;
+ 
+    Added ldap providers for users and groups.
+
+    Added support for the --all option to puppetca --clean.  If
+    puppetca --clean --all is issued then all client certificates
+    are removed.
+ 
+    Resources now return the 'should' value for properties from
+    the [] accessor method (they previously threw an exception when
+    this method was used with properties).  This shouldn't have any
+    affect functionally; it just makes the method equivalent to 'should'
+    for properties, but it works for all attribute types now.
+
+    Modified the 'master' handler to use the Catalog class to
+    compile node configurations, rather than using the Configuration
+    handler, which was never used directly.  I removed the Configuration
+    handler as a result.
+
+    Modified the 'master' handler (responsible for sending configurations
+    to clients) to always return Time.now as its compile date, so
+    configurations will always get recompiled.
+
+    Fixed #1184 -- definitions now autoload correctly all of the time.
+
+    Removed the code from the client that tries to avoid recompiling
+    the catalog. The client will now always recompile, assuming it
+    can reach the server.  It will still use the cached config if
+    there's a failure.
+
+    Fixing #1173 -- classes and definitions can now have the same
+    name as a directory with no failures.
+
+    Saving new facts now expires any cached node information.
+
+    Switching how caching is handled, so that objects now all
+    have an expiration date associated with them.  This makes it
+    much easier to know whether a given cached object should be used
+    or if it should be regenerated.
+
+    Changing the default environment to production.
+
+0.24.4
     Pass source to pkg_add via the PKG_PATH environment variable if
     it ends in a '/' indicating it is a directory. Allows pkg_add
     to resolve dependancies, and make it possible to specify packages
diff --git a/lib/puppet/provider/service/redhat.rb b/lib/puppet/provider/service/redhat.rb
index b013c34..d465e35 100755
--- a/lib/puppet/provider/service/redhat.rb
+++ b/lib/puppet/provider/service/redhat.rb
@@ -16,7 +16,6 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
     def disable
         begin
             output = chkconfig(@resource[:name], :off)
-            output += chkconfig("--del", @resource[:name])
         rescue Puppet::ExecutionFailure
             raise Puppet::Error, "Could not disable %s: %s" %
                 [self.name, output]
@@ -43,8 +42,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
     # in the init scripts.
     def enable
         begin
-            output = chkconfig("--add", @resource[:name])
-            output += chkconfig(@resource[:name], :on)
+            output = chkconfig(@resource[:name], :on)
         rescue Puppet::ExecutionFailure => detail
             raise Puppet::Error, "Could not enable %s: %s" %
                 [self.name, detail]

-- 
Puppet packaging for Debian