Fixing reports so that multiple host report directories can be created. There was a config conflict before.

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

1 files changed, 12 insertions, 12 deletions

diff --git a/lib/puppet/server/report.rb b/lib/puppet/server/report.rb
index e584fb61b..8aa4449b2 100755
--- a/lib/puppet/server/report.rb
+++ b/lib/puppet/server/report.rb
@@ -86,18 +86,6 @@ class Server
             end
         end
 
-        def mkclientdir(client, dir)
-            Puppet.config.setdefaults("reportclient-#{client}",
-                :clientdir => { :default => dir,
-                    :mode => 0750,
-                    :owner => "$user",
-                    :group => "$group"
-                }
-            )
-
-            Puppet.config.use("reportclient-#{client}")
-        end
-
         # Accept a report from a client.
         def report(report, client = nil, clientip = nil)
             # We need the client name for storing files.
@@ -148,6 +136,18 @@ class Server
 
         private
 
+        def mkclientdir(client, dir)
+            Puppet.config.setdefaults("reportclient-#{client}",
+                "clientdir-#{client}" => { :default => dir,
+                    :mode => 0750,
+                    :owner => "$user",
+                    :group => "$group"
+                }
+            )
+
+            Puppet.config.use("reportclient-#{client}")
+        end
+
         # Process the report using all of the existing hooks.
         def process(report)
             return if Puppet[:reports] == "none"