Moving the authconfig setting to configuration.rb instead of network/authconfig.rb, as mentioned by Koen Vereeken

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2345 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 6 insertions, 8 deletions

diff --git a/lib/puppet/configuration.rb b/lib/puppet/configuration.rb
index 018d5f787..67c772eac 100644
--- a/lib/puppet/configuration.rb
+++ b/lib/puppet/configuration.rb
@@ -114,7 +114,12 @@ module Puppet
         },
         :ignoreimport => [false, "A parameter that can be used in commit
             hooks, since it enables you to parse-check a single file rather
-            than requiring that all files exist."]
+            than requiring that all files exist."],
+        :authconfig => [ "$confdir/namespaceauth.conf",
+            "The configuration file that defines the rights to the different
+            namespaces and methods.  This can be used as a coarse-grained
+            authorization system for both ``puppetd`` and ``puppetmasterd``."
+        ]
     )
 
     # Define the config default.
diff --git a/lib/puppet/network/authconfig.rb b/lib/puppet/network/authconfig.rb
index 19fbc6cf3..ebf005022 100644
--- a/lib/puppet/network/authconfig.rb
+++ b/lib/puppet/network/authconfig.rb
@@ -4,13 +4,6 @@ require 'puppet/network/rights'
 module Puppet
     class ConfigurationError < Puppet::Error; end
     class Network::AuthConfig < Puppet::Util::LoadedFile
-        Puppet.config.setdefaults(:puppet,
-            :authconfig => [ "$confdir/namespaceauth.conf",
-                "The configuration file that defines the rights to the different
-                namespaces and methods.  This can be used as a coarse-grained
-                authorization system for both ``puppetd`` and ``puppetmasterd``."
-            ]
-        )
 
         def self.main
             unless defined? @main