Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replacing Generic Configuration with our own #389

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replacing Generic Configuration with our own #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions dotenv.example → .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@ APPSIGNAL_PUSH_API_KEY=
APPSIGNAL_APP_NAME=

# S3 Variables (See AWS Manual)
S3_KEY=
S3_SECRET=
S3_BUCKET_NAME=
S3_KEY=1234ABC
S3_SECRET=1234ACZ
S3_BUCKET_NAME=chicago-atlas

# Port to Be using
PORT=
PORT=3000
RACK_ENV=


# Rails Secret Key
SECRET_KEY_BASE =
SECRET_KEY_BASE=

# Devise Secret key

Expand Down
3 changes: 0 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
!/log/.keep
/tmp

# Ignore Database Config
/config/database.yml
.env
.DS_Store
.idea/

Expand Down
18 changes: 18 additions & 0 deletions config/database.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
default: &default
adapter: postgresql
pool: 5
host: localhost
timeout: 5000

development:
<<: *default
database: chicago-atlas_development

test:
<<: *default
database: chicago-atlas_test

production:
# TODO: setup our.postgres ip here with password and user
<<: *default
database: chicago-atlas_production
28 changes: 0 additions & 28 deletions config/database.yml.example
View file
Open in desktop

This file was deleted.