1 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/filebucket.rb b/lib/puppet/filebucket.rb
index 8a613359c..e67b58668 100755
--- a/lib/puppet/filebucket.rb
+++ b/lib/puppet/filebucket.rb
@@ -60,7 +60,11 @@ module FileBucket
                 @bucket = hash[:Path]
                 hash.delete(:Path)
             else
-                @bucket = "/var/puppet/filebucket"
+                if defined? Puppet
+                    @bucket = File.join(Puppet[:puppetroot], "bucket")
+                else
+                    @bucket = File.expand_path("~/.filebucket")
+                end
             end
 
             # XXX this should really be done using Puppet::Type instances...