summaryrefslogtreecommitdiffstats
path: root/lib/puppet/rails.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-02 22:24:32 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-02 22:24:32 +0000
commit86e434e8b9bcbeac7cd56adb8d2a581aafe53bae (patch)
treed8fa6559d9680a24761dd8b391ea01f525e84f4f /lib/puppet/rails.rb
parent2d25816b027b1837bded7b7a723a44ce1c77405e (diff)
downloadpuppet-86e434e8b9bcbeac7cd56adb8d2a581aafe53bae.tar.gz
puppet-86e434e8b9bcbeac7cd56adb8d2a581aafe53bae.tar.xz
puppet-86e434e8b9bcbeac7cd56adb8d2a581aafe53bae.zip
Adding postgres as a dbadapter option
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2019 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/rails.rb')
-rw-r--r--lib/puppet/rails.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb
index 7cb58cd94..8ec02af7c 100644
--- a/lib/puppet/rails.rb
+++ b/lib/puppet/rails.rb
@@ -36,11 +36,13 @@ module Puppet::Rails
case Puppet[:dbadapter]
when "sqlite3":
args[:dbfile] = Puppet[:dblocation]
- when "mysql":
+ when "mysql", "postgresql":
args[:host] = Puppet[:dbserver]
args[:username] = Puppet[:dbuser]
args[:password] = Puppet[:dbpassword]
args[:database] = Puppet[:dbname]
+ else
+ raise ArgumentError, "Invalid db adapter %s" % Puppet[:dbadapter]
end
args
end