diff options
| author | Luke Kanies <luke@madstop.com> | 2007-11-23 19:24:15 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-11-23 19:24:15 -0600 |
| commit | 03c8ffd76cc8f1f1e59527718f1a7235992866b7 (patch) | |
| tree | 26591fe781fab6fd9b41d64af51249c2fae17c46 | |
| parent | 035fa38bf27719450f4e731c45910aebfbed9529 (diff) | |
| download | puppet-03c8ffd76cc8f1f1e59527718f1a7235992866b7.tar.gz puppet-03c8ffd76cc8f1f1e59527718f1a7235992866b7.tar.xz puppet-03c8ffd76cc8f1f1e59527718f1a7235992866b7.zip | |
Adding patch 20070913003810-6856b-cdc8b2e8c6c46eb8d6d073f86291a0fc5a59f429.patch from womble -- Only set the hostname and password if we want them; this allows pgsql ident auth to work it's magic
| -rw-r--r-- | lib/puppet/rails.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb index 55d03b878..c8a06ea1d 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[:host] = Puppet[:dbserver] unless Puppet[:dbserver].empty? args[:username] = Puppet[:dbuser] - args[:password] = Puppet[:dbpassword] + args[:password] = Puppet[:dbpassword] unless Puppet[:dbpassword].empty? args[:database] = Puppet[:dbname] args[:args] = Puppet[:dbsocket] unless Puppet[:dbsocket] == "" else |