mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
Oops, database.yml and redis.yml were still included
This commit is contained in:
parent
47d8a33f04
commit
be9c374285
4
.gitignore
vendored
4
.gitignore
vendored
@ -19,8 +19,8 @@ dump.rdb
|
|||||||
/cache
|
/cache
|
||||||
/coverage/*
|
/coverage/*
|
||||||
|
|
||||||
/config/database.yml
|
config/database.yml
|
||||||
/config/redis.yml
|
config/redis.yml
|
||||||
|
|
||||||
# Ignore the default SQLite database and db dumps
|
# Ignore the default SQLite database and db dumps
|
||||||
/db/*.sqlite3
|
/db/*.sqlite3
|
||||||
|
@ -1,30 +0,0 @@
|
|||||||
development:
|
|
||||||
adapter: postgresql
|
|
||||||
database: discourse_development
|
|
||||||
host: localhost
|
|
||||||
pool: 5
|
|
||||||
timeout: 5000
|
|
||||||
host_names:
|
|
||||||
- "localhost"
|
|
||||||
|
|
||||||
# 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: postgresql
|
|
||||||
database: discourse_test
|
|
||||||
host: localhost
|
|
||||||
pool: 5
|
|
||||||
timeout: 5000
|
|
||||||
host_names:
|
|
||||||
- test.localhost
|
|
||||||
|
|
||||||
# using the test db, so jenkins can run this config
|
|
||||||
# we need it to be in production so it minifies assets
|
|
||||||
production:
|
|
||||||
adapter: postgresql
|
|
||||||
database: discourse_development
|
|
||||||
pool: 5
|
|
||||||
timeout: 5000
|
|
||||||
host_names:
|
|
||||||
- production.localhost
|
|
@ -1,18 +0,0 @@
|
|||||||
defaults: &defaults
|
|
||||||
host: localhost
|
|
||||||
port: 6379
|
|
||||||
db: 0
|
|
||||||
cache_db: 2
|
|
||||||
|
|
||||||
development:
|
|
||||||
<<: *defaults
|
|
||||||
|
|
||||||
test:
|
|
||||||
<<: *defaults
|
|
||||||
db: 1
|
|
||||||
|
|
||||||
staging:
|
|
||||||
<<: *defaults
|
|
||||||
|
|
||||||
production:
|
|
||||||
<<: *defaults
|
|
Loading…
Reference in New Issue
Block a user