diff options
| author | Luke Kanies <luke@madstop.com> | 2007-11-24 14:55:01 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-11-24 14:55:01 -0600 |
| commit | 1b7f0ee67a7589e824c705c4f6f06fd6c59bc586 (patch) | |
| tree | 6f8ae366bf64e71e3f37bf73a2664be320b13ab2 /lib/puppet/rails.rb | |
| parent | e53693e3ff244f8e782b5dc863aa659d46f9a286 (diff) | |
| parent | 8de1412d97ac9d80500efb5cb94451ab67908448 (diff) | |
| download | puppet-1b7f0ee67a7589e824c705c4f6f06fd6c59bc586.tar.gz puppet-1b7f0ee67a7589e824c705c4f6f06fd6c59bc586.tar.xz puppet-1b7f0ee67a7589e824c705c4f6f06fd6c59bc586.zip | |
Merge branch 'wombles-patches'
Diffstat (limited to 'lib/puppet/rails.rb')
| -rw-r--r-- | lib/puppet/rails.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb index 55d03b878..bdb3a3cdc 100644 --- a/lib/puppet/rails.rb +++ b/lib/puppet/rails.rb @@ -41,9 +41,9 @@ module Puppet::Rails when "sqlite3": args[:dbfile] = Puppet[:dblocation] when "mysql", "postgresql": - args[:host] = Puppet[:dbserver] - args[:username] = Puppet[:dbuser] - args[:password] = Puppet[:dbpassword] + args[:host] = Puppet[:dbserver] unless Puppet[:dbserver].empty? + 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] == "" else |