diff options
| author | Luke Kanies <luke@madstop.com> | 2007-11-23 19:39:55 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-11-23 19:39:55 -0600 |
| commit | 28430c48e0849d47eec9f6b554592bef19b2fc26 (patch) | |
| tree | 33abef1cbdf1c80be037b79656f2a81e9febc483 /lib | |
| parent | d7b381b6b30b46f29d7129fd853870ed7c890ad4 (diff) | |
| download | puppet-28430c48e0849d47eec9f6b554592bef19b2fc26.tar.gz puppet-28430c48e0849d47eec9f6b554592bef19b2fc26.tar.xz puppet-28430c48e0849d47eec9f6b554592bef19b2fc26.zip | |
Adding patch 20070913032546-6856b-0de200e8450920e7f712c54bf287ae43c7fda8af.patch from womble -- Only set dbuser if explicitly asked for
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/rails.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb index c8a06ea1d..bdb3a3cdc 100644 --- a/lib/puppet/rails.rb +++ b/lib/puppet/rails.rb @@ -42,7 +42,7 @@ module Puppet::Rails args[:dbfile] = Puppet[:dblocation] when "mysql", "postgresql": args[:host] = Puppet[:dbserver] unless Puppet[:dbserver].empty? - args[:username] = Puppet[:dbuser] + args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].empty? args[:password] = Puppet[:dbpassword] unless Puppet[:dbpassword].empty? args[:database] = Puppet[:dbname] args[:args] = Puppet[:dbsocket] unless Puppet[:dbsocket] == "" |