Skip to content

Commit

Permalink
Changes to databse for postgresql migration and temp fix for heroku prod
Browse files Browse the repository at this point in the history
  • Loading branch information
tjk committed Nov 21, 2011
1 parent 5509ee1 commit 71f6506
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
24 changes: 15 additions & 9 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,28 @@
# Ensure the SQLite 3 gem is defined in your Gemfile
# gem 'sqlite3'
development:
adapter: sqlite3
database: db/development.sqlite3
adapter: postgresql
encoding: unicode
database: acmucsb_dev
pool: 5
timeout: 5000
username: acmucsb
password:

# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test:
adapter: sqlite3
database: db/test.sqlite3
adapter: postgresql
encoding: unicode
database: acmucsb_test
pool: 5
timeout: 5000
username: acmucsb
password:

production:
adapter: sqlite3
database: db/production.sqlite3
adapter: postgresql
encoding: unicode
database: acmucsb_prod
pool: 5
timeout: 5000
username: acmucsb
password:
2 changes: 1 addition & 1 deletion config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
config.assets.compress = true

# Don't fallback to assets pipeline if a precompiled asset is missed
config.assets.compile = false
config.assets.compile = true # TODO: change this back to false later

# Generate digests for assets URLs
config.assets.digest = true
Expand Down

0 comments on commit 71f6506

Please sign in to comment.