ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-26 20:41:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into bug-article-text

Browse source
This commit is contained in:
Luke Barratt 2014-03-27 21:08:10 +00:00
commit 600b41d8e2
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.env.example
View file

@ -7,5 +7,6 @@ UNICORN_WORKERS=4
UNICORN_PORT=5000 UNICORN_PORT=5000
UNICORN_SOCKET=/tmp/unicorn.ensl.sock UNICORN_SOCKET=/tmp/unicorn.ensl.sock
MYSQL_DATABASE=ensl
MYSQL_USERNAME= MYSQL_USERNAME=
MYSQL_PASSWORD= MYSQL_PASSWORD=

3
config/database.yml
View file

@ -3,6 +3,7 @@ base: &db
encoding: utf8 encoding: utf8
pool: 5 pool: 5
host: localhost host: localhost
database: <%= ENV['MYSQL_DATABASE'] %>
username: <%= ENV['MYSQL_USERNAME'] %> username: <%= ENV['MYSQL_USERNAME'] %>
password: <%= ENV['MYSQL_PASSWORD'] %> password: <%= ENV['MYSQL_PASSWORD'] %>
@ -15,9 +16,7 @@ test:
database: ensl_test database: ensl_test
staging: staging:
database: ensl
<<: *db <<: *db
production: production:
database: ensl
<<: *db <<: *db

8
config/deploy/production.rb
View file

@ -2,8 +2,8 @@ set :branch, 'master'
set :rails_env, 'production' set :rails_env, 'production'
set :unicorn_rack_env, fetch(:rails_env) set :unicorn_rack_env, fetch(:rails_env)
role :app, %w{deploy@ensl.org} role :app, %w{vu2009@ensl.org}
role :web, %w{deploy@ensl.org} role :web, %w{vu2009@ensl.org}
role :db, %w{deploy@ensl.org} role :db, %w{vu2009@ensl.org}
server 'ensl.org', user: 'deploy', roles: %w{web app} server 'ensl.org', user: 'vu2009', roles: %w{web app}