fix database defaults
This commit is contained in:
parent
21e920079f
commit
15a17936e8
5
Gemfile
5
Gemfile
@ -4,7 +4,10 @@ source 'https://rubygems.org'
|
|||||||
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
||||||
gem 'rails', '4.1.7'
|
gem 'rails', '4.1.7'
|
||||||
# Use postgresql as the database for Active Record
|
# Use postgresql as the database for Active Record
|
||||||
gem 'pg'
|
gem 'pg', group: :production
|
||||||
|
gem 'sqlite3', group: :development
|
||||||
|
|
||||||
|
|
||||||
# Use SCSS for stylesheets
|
# Use SCSS for stylesheets
|
||||||
gem 'sass-rails', '~> 4.0.3'
|
gem 'sass-rails', '~> 4.0.3'
|
||||||
# Use Uglifier as compressor for JavaScript assets
|
# Use Uglifier as compressor for JavaScript assets
|
||||||
|
@ -93,6 +93,7 @@ GEM
|
|||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
sprockets (>= 2.8, < 4.0)
|
sprockets (>= 2.8, < 4.0)
|
||||||
|
sqlite3 (1.3.9)
|
||||||
thor (0.19.1)
|
thor (0.19.1)
|
||||||
thread_safe (0.3.4)
|
thread_safe (0.3.4)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
@ -116,5 +117,6 @@ DEPENDENCIES
|
|||||||
sass-rails (~> 4.0.3)
|
sass-rails (~> 4.0.3)
|
||||||
sdoc (~> 0.4.0)
|
sdoc (~> 0.4.0)
|
||||||
spring
|
spring
|
||||||
|
sqlite3
|
||||||
turbolinks
|
turbolinks
|
||||||
uglifier (>= 1.3.0)
|
uglifier (>= 1.3.0)
|
||||||
|
@ -1,85 +1,27 @@
|
|||||||
# PostgreSQL. Versions 8.2 and up are supported.
|
|
||||||
#
|
|
||||||
# Install the pg driver:
|
|
||||||
# gem install pg
|
|
||||||
# On OS X with Homebrew:
|
|
||||||
# gem install pg -- --with-pg-config=/usr/local/bin/pg_config
|
|
||||||
# On OS X with MacPorts:
|
|
||||||
# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
|
|
||||||
# On Windows:
|
|
||||||
# gem install pg
|
|
||||||
# Choose the win32 build.
|
|
||||||
# Install PostgreSQL and put its /bin directory on your path.
|
|
||||||
#
|
|
||||||
# Configure Using Gemfile
|
|
||||||
# gem 'pg'
|
|
||||||
#
|
|
||||||
default: &default
|
default: &default
|
||||||
adapter: postgresql
|
adapter: sqlite3
|
||||||
encoding: unicode
|
|
||||||
# For details on connection pooling, see rails configuration guide
|
|
||||||
# http://guides.rubyonrails.org/configuring.html#database-pooling
|
|
||||||
pool: 5
|
pool: 5
|
||||||
|
timeout: 5000
|
||||||
|
|
||||||
development:
|
|
||||||
<<: *default
|
|
||||||
database: roadmap_development
|
|
||||||
|
|
||||||
# The specified database role being used to connect to postgres.
|
|
||||||
# To create additional roles in postgres see `$ createuser --help`.
|
|
||||||
# When left blank, postgres will use the default role. This is
|
|
||||||
# the same name as the operating system user that initialized the database.
|
|
||||||
#username: roadmap
|
|
||||||
|
|
||||||
# The password associated with the postgres role (username).
|
|
||||||
#password:
|
|
||||||
|
|
||||||
# Connect on a TCP socket. Omitted by default since the client uses a
|
|
||||||
# domain socket that doesn't need configuration. Windows does not have
|
|
||||||
# domain sockets, so uncomment these lines.
|
|
||||||
#host: localhost
|
|
||||||
|
|
||||||
# The TCP port the server listens on. Defaults to 5432.
|
|
||||||
# If your server runs on a different port number, change accordingly.
|
|
||||||
#port: 5432
|
|
||||||
|
|
||||||
# Schema search path. The server defaults to $user,public
|
|
||||||
#schema_search_path: myapp,sharedapp,public
|
|
||||||
|
|
||||||
# Minimum log levels, in increasing order:
|
|
||||||
# debug5, debug4, debug3, debug2, debug1,
|
|
||||||
# log, notice, warning, error, fatal, and panic
|
|
||||||
# Defaults to warning.
|
|
||||||
#min_messages: notice
|
|
||||||
|
|
||||||
# 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:
|
test:
|
||||||
<<: *default
|
<<: *default
|
||||||
database: roadmap_test
|
database: db/test.sqlite3
|
||||||
|
|
||||||
|
development:
|
||||||
|
database: db/development.sqlite3
|
||||||
|
adapter: sqlite3
|
||||||
|
pool: 5
|
||||||
|
timeout: 5000
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# As with config/secrets.yml, you never want to store sensitive information,
|
|
||||||
# like your database password, in your source code. If your source code is
|
|
||||||
# ever seen by anyone, they now have access to your database.
|
|
||||||
#
|
|
||||||
# Instead, provide the password as a unix environment variable when you boot
|
|
||||||
# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
|
|
||||||
# for a full rundown on how to provide these environment variables in a
|
|
||||||
# production deployment.
|
|
||||||
#
|
|
||||||
# On Heroku and other platform providers, you may have a full connection URL
|
|
||||||
# available as an environment variable. For example:
|
|
||||||
#
|
|
||||||
# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
|
|
||||||
#
|
|
||||||
# You can use this database configuration with:
|
|
||||||
#
|
|
||||||
# production:
|
|
||||||
# url: <%= ENV['DATABASE_URL'] %>
|
|
||||||
#
|
|
||||||
production:
|
production:
|
||||||
<<: *default
|
adapter: postgresql
|
||||||
|
encoding: unicode
|
||||||
|
pool: 5
|
||||||
database: roadmap_production
|
database: roadmap_production
|
||||||
username: roadmap
|
username: roadmap
|
||||||
password: <%= ENV['ROADMAP_DATABASE_PASSWORD'] %>
|
password: <%= ENV['ROADMAP_DATABASE_PASSWORD'] %>
|
||||||
|
Loading…
Reference in New Issue
Block a user