diff options
| -rw-r--r-- | lib/puppet/defaults.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/rails.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index b4cd3d5de..616c1519d 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -535,6 +535,8 @@ module Puppet used when networked databases are used."], :dbpassword => [ "puppet", "The database password for Client caching. Only used when networked databases are used."], + :dbsocket => [ "", "The database socket location. Only used when networked + databases are used. Will be ignored if the value is an empty string."], :railslog => {:default => "$logdir/rails.log", :mode => 0600, :owner => "$user", diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb index e9be5a547..55d03b878 100644 --- a/lib/puppet/rails.rb +++ b/lib/puppet/rails.rb @@ -45,6 +45,7 @@ module Puppet::Rails args[:username] = Puppet[:dbuser] args[:password] = Puppet[:dbpassword] args[:database] = Puppet[:dbname] + args[:args] = Puppet[:dbsocket] unless Puppet[:dbsocket] == "" else raise ArgumentError, "Invalid db adapter %s" % Puppet[:dbadapter] end |