summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-11-01 15:58:09 -0700
committerMarkus Roberts <Markus@reality.com>2010-11-10 15:29:13 -0800
commitba4d22bce3fbb7af3bef50088623605350a9891e (patch)
tree6d2179f9ac86d1d27c2bbaf20eb14d61e700fb65 /lib
parent4a3d5d7c11bea5efba6f8fa8074b52c7161fd1d3 (diff)
downloadpuppet-ba4d22bce3fbb7af3bef50088623605350a9891e.tar.gz
puppet-ba4d22bce3fbb7af3bef50088623605350a9891e.tar.xz
puppet-ba4d22bce3fbb7af3bef50088623605350a9891e.zip
Maint. Removing code for which no CLA has been signed
Multiple attemps were made to contact the author of this code in order to obtain a Contributor Licence Agreement, but we were unable to do so.
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/defaults.rb3
-rw-r--r--lib/puppet/rails.rb6
2 files changed, 0 insertions, 9 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 972e9e66c..72b1af188 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -665,9 +665,6 @@ module Puppet
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."],
- :dbconnections => [ 0, "The number of database connections. Only used when
- networked databases are used. Will be ignored if the value is an empty
- string or is less than 1."],
:railslog => {:default => "$logdir/rails.log",
:mode => 0600,
:owner => "service",
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb
index c2d492fdd..44e7a8343 100644
--- a/lib/puppet/rails.rb
+++ b/lib/puppet/rails.rb
@@ -57,16 +57,10 @@ module Puppet::Rails
socket = Puppet[:dbsocket]
args[:socket] = socket unless socket.to_s.empty?
-
- connections = Puppet[:dbconnections].to_i
- args[:pool] = connections if connections > 0
when "oracle_enhanced":
args[:database] = Puppet[:dbname] unless Puppet[:dbname].to_s.empty?
args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].to_s.empty?
args[:password] = Puppet[:dbpassword] unless Puppet[:dbpassword].to_s.empty?
-
- connections = Puppet[:dbconnections].to_i
- args[:pool] = connections if connections > 0
else
raise ArgumentError, "Invalid db adapter #{adapter}"
end