Commit 51feadb2 by tady (Masato TADA)

Merge pull request #137 from tadyjp/heroku

Move to Heroku
parents 24988b65 baac0c67
RV_RENDEZVOUS_APP_HOST=http://localhost:3000
RV_GOOGLE_API_CLIENT_ID=xxxxxxxxxxxxx-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.apps.googleusercontent.com
RV_GOOGLE_API_SECRET=xxxxxxxxxxxxxxxxxxxxxxxx
RV_S3_ASSESS_KEY_ID=xxxxxxxxxxxxxxxxxxxxxxxx
RV_S3_SECRET_ACCESS_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
RV_S3_BACKET_NAME=xxxxxxxxxxxxxxxxxxxxx
RV_PDF_UPLOADING=1
DATABASE_URL=mysql2://user:passwd@localhost/rendezvous_development
RV_ALLOW_IPS=1.1.1.1,2.2.2.2
...@@ -17,19 +17,17 @@ ...@@ -17,19 +17,17 @@
/log/*.log /log/*.log
/tmp /tmp
/coverage/.* /coverage/.*
*.bk *.bk
/db/*.sql /db/*.sql
# secret files
/config/database.yml
/config/settings.yml
/backup /backup
/script/backup.sh /script/backup.sh
.rbenv-gemsets .rbenv-gemsets
.ruby-version .ruby-version
.env
!.env.sample
bundler_args: "--without development --path=~/.bundle" bundler_args: "--without development --path=~/.bundle"
language: ruby language: ruby
rvm: rvm:
- 2.1.2 - 2.1.4
env: env:
matrix: matrix:
- DB_TEST_DATABASE=rendezvous_test DB_TEST_USER=travis - DB_TEST_DATABASE=rendezvous_test DB_TEST_USER=travis
...@@ -20,8 +20,6 @@ before_install: ...@@ -20,8 +20,6 @@ before_install:
- sh ./script/travis/bundle_install.sh - sh ./script/travis/bundle_install.sh
before_script: before_script:
- mysql -e 'CREATE DATABASE rendezvous_test;' - mysql -e 'CREATE DATABASE rendezvous_test;'
- cp config/database.yml.example config/database.yml
- cp config/settings.yml.example config/settings.yml
after_script: after_script:
- ruby script/travis/bundle_cache.rb - ruby script/travis/bundle_cache.rb
script: bundle exec rake db:create db:test:load spec teaspoon script: bundle exec rake db:create db:test:load spec teaspoon
source 'https://rubygems.org' source 'https://rubygems.org'
ruby '2.1.4'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 4.1' gem 'rails', '~> 4.1'
...@@ -91,6 +93,8 @@ group :development, :test do ...@@ -91,6 +93,8 @@ group :development, :test do
gem 'teaspoon' gem 'teaspoon'
gem 'guard-teaspoon' gem 'guard-teaspoon'
gem 'byebug' gem 'byebug'
gem 'dotenv-rails'
end end
group :test do group :test do
...@@ -149,3 +153,11 @@ gem 'hipchat' ...@@ -149,3 +153,11 @@ gem 'hipchat'
# For PDF upload # For PDF upload
gem 'rmagick', :require => 'RMagick' gem 'rmagick', :require => 'RMagick'
# for heroku
gem 'rails_12factor', group: :production
gem 'mysql'
# for IP restriction
gem 'rack-contrib', require: 'rack/contrib'
GIT GIT
remote: git://github.com/amatsuda/kaminari.git remote: git://github.com/amatsuda/kaminari.git
revision: 5b221e01ea63852a3894c6b0c3c6de50cdace27a revision: b1281e21452486b49911e8616fce885b0ea46730
specs: specs:
kaminari (1.0.0.alpha) kaminari (1.0.0.alpha)
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
...@@ -17,38 +17,38 @@ GIT ...@@ -17,38 +17,38 @@ GIT
GIT GIT
remote: git://github.com/rails/sass-rails.git remote: git://github.com/rails/sass-rails.git
revision: 57ec3397ff99655890895df29a7bf3f683410256 revision: 80e15690b66131edc1b8ccb4ab7dbbd5bf567042
specs: specs:
sass-rails (5.0.0.dev) sass-rails (5.0.0.beta1)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.2) sass (~> 3.2, >= 3.2.2)
sprockets (~> 2.12) sprockets (~> 2.12)
sprockets-rails (~> 2.0) sprockets-rails (>= 2.0, < 4.0)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.1.4) actionmailer (4.1.7)
actionpack (= 4.1.4) actionpack (= 4.1.7)
actionview (= 4.1.4) actionview (= 4.1.7)
mail (~> 2.5.4) mail (~> 2.5, >= 2.5.4)
actionpack (4.1.4) actionpack (4.1.7)
actionview (= 4.1.4) actionview (= 4.1.7)
activesupport (= 4.1.4) activesupport (= 4.1.7)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionview (4.1.4) actionview (4.1.7)
activesupport (= 4.1.4) activesupport (= 4.1.7)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
activemodel (4.1.4) activemodel (4.1.7)
activesupport (= 4.1.4) activesupport (= 4.1.7)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.1.4) activerecord (4.1.7)
activemodel (= 4.1.4) activemodel (= 4.1.7)
activesupport (= 4.1.4) activesupport (= 4.1.7)
arel (~> 5.0.0) arel (~> 5.0.0)
activesupport (4.1.4) activesupport (4.1.7)
i18n (~> 0.6, >= 0.6.9) i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
...@@ -62,29 +62,33 @@ GEM ...@@ -62,29 +62,33 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
arel (5.0.1.20140414130214) arel (5.0.1.20140414130214)
ast (2.0.0) ast (2.0.0)
astrolabe (1.3.0)
parser (>= 2.2.0.pre.3, < 3.0)
aws-sdk (1.39.0) aws-sdk (1.39.0)
json (~> 1.4) json (~> 1.4)
nokogiri (>= 1.4.4) nokogiri (>= 1.4.4)
bcrypt (3.1.7) bcrypt (3.1.9)
better_errors (1.1.0) better_errors (2.0.0)
coderay (>= 1.0.0) coderay (>= 1.0.0)
erubis (>= 2.6.6) erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2) binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
breadcrumble (4.1.0) breadcrumble (4.1.0)
rails (>= 4.0.0) rails (>= 4.0.0)
builder (3.2.2) builder (3.2.2)
byebug (3.1.2) byebug (3.5.1)
columnize (~> 0.8) columnize (~> 0.8)
debugger-linecache (~> 1.2) debugger-linecache (~> 1.2)
slop (~> 3.6)
capistrano (3.2.1) capistrano (3.2.1)
i18n i18n
rake (>= 10.0.0) rake (>= 10.0.0)
sshkit (~> 1.3) sshkit (~> 1.3)
capistrano-bundler (1.1.2) capistrano-bundler (1.1.3)
capistrano (~> 3.0) capistrano (~> 3.1)
sshkit (~> 1.2) sshkit (~> 1.2)
capistrano-rails (1.1.1) capistrano-rails (1.1.2)
capistrano (~> 3.1) capistrano (~> 3.1)
capistrano-bundler (~> 1.1) capistrano-bundler (~> 1.1)
capistrano-rbenv (2.0.2) capistrano-rbenv (2.0.2)
...@@ -92,26 +96,26 @@ GEM ...@@ -92,26 +96,26 @@ GEM
sshkit (~> 1.3) sshkit (~> 1.3)
capistrano3-unicorn (0.2.1) capistrano3-unicorn (0.2.1)
capistrano (~> 3.1, >= 3.1.0) capistrano (~> 3.1, >= 3.1.0)
capybara (2.4.1) capybara (2.4.4)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
xpath (~> 2.0) xpath (~> 2.0)
celluloid (0.15.2) celluloid (0.16.0)
timers (~> 1.1.0) timers (~> 4.0.0)
cliver (0.3.2) cliver (0.3.2)
coderay (1.1.0) coderay (1.1.0)
coffee-rails (4.0.1) coffee-rails (4.1.0)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
coffee-script (2.3.0) coffee-script (2.3.0)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.7.1) coffee-script-source (1.8.0)
colorize (0.7.3) colorize (0.7.3)
columnize (0.8.9) columnize (0.8.9)
coveralls (0.7.0) coveralls (0.7.1)
multi_json (~> 1.3) multi_json (~> 1.3)
rest-client rest-client
simplecov (>= 0.7) simplecov (>= 0.7)
...@@ -120,42 +124,46 @@ GEM ...@@ -120,42 +124,46 @@ GEM
css_parser (1.3.5) css_parser (1.3.5)
addressable addressable
daemons (1.1.9) daemons (1.1.9)
database_rewinder (0.2.0) database_rewinder (0.4.1)
debug_inspector (0.0.2) debug_inspector (0.0.2)
debugger-linecache (1.2.0) debugger-linecache (1.2.0)
devise (3.2.4) devise (3.4.1)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5) railties (>= 3.2.6, < 5)
responders
thread_safe (~> 0.1) thread_safe (~> 0.1)
warden (~> 1.2.3) warden (~> 1.2.3)
diff-lcs (1.2.5) diff-lcs (1.2.5)
docile (1.1.5) docile (1.1.5)
domain_name (0.5.19) domain_name (0.5.22)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
draper (1.3.1) dotenv (1.0.2)
dotenv-rails (1.0.2)
dotenv (= 1.0.2)
draper (1.4.0)
actionpack (>= 3.0) actionpack (>= 3.0)
activemodel (>= 3.0) activemodel (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
request_store (~> 1.0.3) request_store (~> 1.0)
erubis (2.7.0) erubis (2.7.0)
eventmachine (1.0.3) eventmachine (1.0.3)
execjs (2.2.1) execjs (2.2.2)
factory_girl (4.4.0) factory_girl (4.5.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
factory_girl_rails (4.4.1) factory_girl_rails (4.5.0)
factory_girl (~> 4.4.0) factory_girl (~> 4.5.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faraday (0.9.0) faraday (0.9.0)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
ffi (1.9.3) ffi (1.9.6)
formatador (0.2.5) formatador (0.2.5)
gherkin (2.12.2) gherkin (2.12.2)
multi_json (~> 1.3) multi_json (~> 1.3)
github-markdown (0.6.6) github-markdown (0.6.7)
gmail_xoauth (0.4.1) gmail_xoauth (0.4.1)
oauth (>= 0.3.6) oauth (>= 0.3.6)
guard (2.6.1) guard (2.7.1)
formatador (>= 0.2.4) formatador (>= 0.2.4)
listen (~> 2.7) listen (~> 2.7)
lumberjack (~> 1.0) lumberjack (~> 1.0)
...@@ -170,10 +178,11 @@ GEM ...@@ -170,10 +178,11 @@ GEM
guard-teaspoon (0.8.0) guard-teaspoon (0.8.0)
guard (~> 2.2) guard (~> 2.2)
teaspoon (>= 0.8.0) teaspoon (>= 0.8.0)
hashie (3.2.0) hashie (3.3.1)
hike (1.2.3) hike (1.2.3)
hipchat (1.2.0) hipchat (1.4.0)
httparty httparty
hitimes (1.2.2)
htmlentities (4.3.2) htmlentities (4.3.2)
http-cookie (1.0.2) http-cookie (1.0.2)
domain_name (~> 0.5) domain_name (~> 0.5)
...@@ -184,10 +193,115 @@ GEM ...@@ -184,10 +193,115 @@ GEM
i18n_generators (1.2.1) i18n_generators (1.2.1)
mechanize mechanize
rails (>= 3.0.0) rails (>= 3.0.0)
jbuilder (2.1.3) rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
rails (>= 3.0.0)
jbuilder (2.2.4)
activesupport (>= 3.0.0, < 5) activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2) multi_json (~> 1.2)
jquery-rails (3.1.1) jquery-rails (3.1.2)
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.8.1) json (1.8.1)
...@@ -196,39 +310,39 @@ GEM ...@@ -196,39 +310,39 @@ GEM
kgio (2.9.2) kgio (2.9.2)
launchy (2.4.2) launchy (2.4.2)
addressable (~> 2.3) addressable (~> 2.3)
libv8 (3.16.14.3) libv8 (3.16.14.7)
listen (2.7.9) listen (2.7.11)
celluloid (>= 0.15.2) celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9) rb-inotify (>= 0.9)
lumberjack (1.0.9) lumberjack (1.0.9)
mail (2.5.4) mail (2.6.1)
mime-types (~> 1.16) mime-types (>= 1.16, < 3)
treetop (~> 1.4.8) mechanize (2.7.3)
mechanize (2.7.2)
domain_name (~> 0.5, >= 0.5.1) domain_name (~> 0.5, >= 0.5.1)
http-cookie (~> 1.0.0) http-cookie (~> 1.0)
mime-types (~> 1.17, >= 1.17.2) mime-types (~> 2.0)
net-http-digest_auth (~> 1.1, >= 1.1.1) net-http-digest_auth (~> 1.1, >= 1.1.1)
net-http-persistent (~> 2.5, >= 2.5.2) net-http-persistent (~> 2.5, >= 2.5.2)
nokogiri (~> 1.4) nokogiri (~> 1.4)
ntlm-http (~> 0.1, >= 0.1.1) ntlm-http (~> 0.1, >= 0.1.1)
webrobots (>= 0.0.9, < 0.2) webrobots (>= 0.0.9, < 0.2)
method_source (0.8.2) method_source (0.8.2)
mime-types (1.25.1) mime-types (2.4.3)
mini_portile (0.6.0) mini_portile (0.6.0)
minitest (5.4.0) minitest (5.4.2)
multi_json (1.10.1) multi_json (1.10.1)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
mysql (2.9.1)
mysql2 (0.3.16) mysql2 (0.3.16)
net-http-digest_auth (1.4) net-http-digest_auth (1.4)
net-http-persistent (2.9.4) net-http-persistent (2.9.4)
net-scp (1.2.1) net-scp (1.2.1)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (2.9.1) net-ssh (2.9.1)
netrc (0.7.7) netrc (0.8.0)
newrelic_rpm (3.9.1.236) newrelic_rpm (3.9.6.257)
nokogiri (1.6.3.1) nokogiri (1.6.3.1)
mini_portile (= 0.6.0) mini_portile (= 0.6.0)
ntlm-http (0.1.1) ntlm-http (0.1.1)
...@@ -242,7 +356,7 @@ GEM ...@@ -242,7 +356,7 @@ GEM
omniauth (1.2.2) omniauth (1.2.2)
hashie (>= 1.2, < 4) hashie (>= 1.2, < 4)
rack (~> 1.0) rack (~> 1.0)
omniauth-google-oauth2 (0.2.5) omniauth-google-oauth2 (0.2.6)
omniauth (> 1.0) omniauth (> 1.0)
omniauth-oauth2 (~> 1.1) omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (1.1.2) omniauth-oauth2 (1.1.2)
...@@ -251,10 +365,10 @@ GEM ...@@ -251,10 +365,10 @@ GEM
oauth2 (~> 0.9.3) oauth2 (~> 0.9.3)
omniauth (~> 1.2) omniauth (~> 1.2)
orm_adapter (0.5.0) orm_adapter (0.5.0)
paper_trail (3.0.3) paper_trail (3.0.6)
activerecord (>= 3.0, < 5.0) activerecord (>= 3.0, < 5.0)
activesupport (>= 3.0, < 5.0) activesupport (>= 3.0, < 5.0)
parser (2.2.0.pre.3) parser (2.2.0.pre.6)
ast (>= 1.1, < 3.0) ast (>= 1.1, < 3.0)
slop (~> 3.4, >= 3.4.5) slop (~> 3.4, >= 3.4.5)
poltergeist (1.5.1) poltergeist (1.5.1)
...@@ -262,35 +376,41 @@ GEM ...@@ -262,35 +376,41 @@ GEM
cliver (~> 0.3.1) cliver (~> 0.3.1)
multi_json (~> 1.0) multi_json (~> 1.0)
websocket-driver (>= 0.2.0) websocket-driver (>= 0.2.0)
polyglot (0.3.5)
powerpack (0.0.9) powerpack (0.0.9)
premailer (1.8.2) premailer (1.8.2)
css_parser (>= 1.3.5) css_parser (>= 1.3.5)
htmlentities (>= 4.0.0) htmlentities (>= 4.0.0)
pry (0.10.0) pry (0.10.1)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
slop (~> 3.4) slop (~> 3.4)
pry-rails (0.3.2) pry-rails (0.3.2)
pry (>= 0.9.10) pry (>= 0.9.10)
rack (1.5.2) rack (1.5.2)
rack-contrib (1.2.0)
rack (>= 0.9.1)
rack-mini-profiler (0.9.2) rack-mini-profiler (0.9.2)
rack (>= 1.1.3) rack (>= 1.1.3)
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.4) rails (4.1.7)
actionmailer (= 4.1.4) actionmailer (= 4.1.7)
actionpack (= 4.1.4) actionpack (= 4.1.7)
actionview (= 4.1.4) actionview (= 4.1.7)
activemodel (= 4.1.4) activemodel (= 4.1.7)
activerecord (= 4.1.4) activerecord (= 4.1.7)
activesupport (= 4.1.4) activesupport (= 4.1.7)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.4) railties (= 4.1.7)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
railties (4.1.4) rails_12factor (0.0.3)
actionpack (= 4.1.4) rails_serve_static_assets
activesupport (= 4.1.4) rails_stdout_logging
rails_serve_static_assets (0.0.2)
rails_stdout_logging (0.0.3)
railties (4.1.7)
actionpack (= 4.1.7)
activesupport (= 4.1.7)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.0.0) rainbow (2.0.0)
...@@ -299,92 +419,92 @@ GEM ...@@ -299,92 +419,92 @@ GEM
rb-fsevent (0.9.4) rb-fsevent (0.9.4)
rb-inotify (0.9.5) rb-inotify (0.9.5)
ffi (>= 0.5.0) ffi (>= 0.5.0)
rdoc (4.1.1) rdoc (4.1.2)
json (~> 1.4) json (~> 1.4)
ref (1.0.5) ref (1.0.5)
request_store (1.0.8) request_store (1.1.0)
responders (1.1.1)
railties (>= 3.2, < 4.2)
rest-client (1.7.2) rest-client (1.7.2)
mime-types (>= 1.16, < 3.0) mime-types (>= 1.16, < 3.0)
netrc (~> 0.7) netrc (~> 0.7)
rmagick (2.13.3) rmagick (2.13.3)
rspec (3.0.0) rspec (3.1.0)
rspec-core (~> 3.0.0) rspec-core (~> 3.1.0)
rspec-expectations (~> 3.0.0) rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.0.0) rspec-mocks (~> 3.1.0)
rspec-core (3.0.3) rspec-core (3.1.7)
rspec-support (~> 3.0.0) rspec-support (~> 3.1.0)
rspec-expectations (3.0.3) rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0) rspec-support (~> 3.1.0)
rspec-mocks (3.0.3) rspec-mocks (3.1.3)
rspec-support (~> 3.0.0) rspec-support (~> 3.1.0)
rspec-rails (3.0.2) rspec-rails (3.1.0)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0) railties (>= 3.0)
rspec-core (~> 3.0.0) rspec-core (~> 3.1.0)
rspec-expectations (~> 3.0.0) rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.0.0) rspec-mocks (~> 3.1.0)
rspec-support (~> 3.0.0) rspec-support (~> 3.1.0)
rspec-support (3.0.3) rspec-support (3.1.2)
rubocop (0.24.1) rubocop (0.27.0)
json (>= 1.7.7, < 2) astrolabe (~> 1.3)
parser (>= 2.2.0.pre.3, < 3.0) parser (>= 2.2.0.pre.6, < 3.0)
powerpack (~> 0.0.6) powerpack (~> 0.0.6)
rainbow (>= 1.99.1, < 3.0) rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4) ruby-progressbar (~> 1.4)
ruby-progressbar (1.5.1) ruby-progressbar (1.6.1)
sass (3.3.14) sass (3.4.7)
sdoc (0.4.0) sdoc (0.4.1)
json (~> 1.8) json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0, < 5.0) rdoc (~> 4.0)
settingslogic (2.0.9) settingslogic (2.0.9)
simplecov (0.9.0) simplecov (0.9.1)
docile (~> 1.1.0) docile (~> 1.1.0)
multi_json multi_json (~> 1.0)
simplecov-html (~> 0.8.0) simplecov-html (~> 0.8.0)
simplecov-html (0.8.0) simplecov-html (0.8.0)
slim (2.0.3) slim (2.1.0)
temple (~> 0.6.6) temple (~> 0.6.9)
tilt (>= 1.3.3, < 2.1) tilt (>= 1.3.3, < 2.1)
slop (3.6.0) slop (3.6.0)
sprockets (2.12.1) sprockets (2.12.3)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.1.3) sprockets-rails (2.2.0)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (~> 2.8) sprockets (>= 2.8, < 4.0)
sshkit (1.5.1) sshkit (1.5.1)
colorize colorize
net-scp (>= 1.1.2) net-scp (>= 1.1.2)
net-ssh (>= 2.8.0) net-ssh (>= 2.8.0)
teaspoon (0.8.0) teaspoon (0.8.0)
railties (>= 3.2.5, < 5) railties (>= 3.2.5, < 5)
temple (0.6.8) temple (0.6.10)
term-ansicolor (1.3.0) term-ansicolor (1.3.0)
tins (~> 1.0) tins (~> 1.0)
therubyracer (0.12.1) therubyracer (0.12.1)
libv8 (~> 3.16.14.0) libv8 (~> 3.16.14.0)
ref ref
thin (1.6.2) thin (1.6.3)
daemons (>= 1.0.9) daemons (~> 1.0, >= 1.0.9)
eventmachine (>= 1.0.0) eventmachine (~> 1.0)
rack (>= 1.0.0) rack (~> 1.0)
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)
timers (1.1.0) timers (4.0.1)
tins (1.3.0) hitimes
treetop (1.4.15) tins (1.3.3)
polyglot turnip (1.2.4)
polyglot (>= 0.3.1)
turnip (1.2.2)
gherkin (>= 2.5) gherkin (>= 2.5)
rspec (>= 2.0, < 4.0) rspec (>= 2.14.0, < 4.0)
tzinfo (1.2.1) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.5.3) uglifier (2.5.3)
execjs (>= 0.3.0) execjs (>= 0.3.0)
...@@ -396,11 +516,12 @@ GEM ...@@ -396,11 +516,12 @@ GEM
kgio (~> 2.6) kgio (~> 2.6)
rack rack
raindrops (~> 0.7) raindrops (~> 0.7)
validates_email_format_of (1.5.3) validates_email_format_of (1.6.1)
i18n
warden (1.2.3) warden (1.2.3)
rack (>= 1.0) rack (>= 1.0)
webrobots (0.1.1) webrobots (0.1.1)
websocket-driver (0.3.4) websocket-driver (0.3.5)
xpath (2.0.0) xpath (2.0.0)
nokogiri (~> 1.3) nokogiri (~> 1.3)
...@@ -427,6 +548,7 @@ DEPENDENCIES ...@@ -427,6 +548,7 @@ DEPENDENCIES
coveralls coveralls
database_rewinder database_rewinder
devise devise
dotenv-rails
draper (~> 1.3) draper (~> 1.3)
factory_girl_rails factory_girl_rails
faraday faraday
...@@ -442,6 +564,7 @@ DEPENDENCIES ...@@ -442,6 +564,7 @@ DEPENDENCIES
kaminari! kaminari!
launchy launchy
mail mail
mysql
mysql2 mysql2
newrelic_rpm newrelic_rpm
nokogiri nokogiri
...@@ -450,8 +573,10 @@ DEPENDENCIES ...@@ -450,8 +573,10 @@ DEPENDENCIES
poltergeist poltergeist
premailer premailer
pry-rails pry-rails
rack-contrib
rack-mini-profiler rack-mini-profiler
rails (~> 4.1) rails (~> 4.1)
rails_12factor
rmagick rmagick
rspec-rails rspec-rails
rubocop rubocop
......
web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
...@@ -11,8 +11,7 @@ A simple markdown-based blog & wiki system for team. ...@@ -11,8 +11,7 @@ A simple markdown-based blog & wiki system for team.
# Supported versions # Supported versions
- Ruby 2.0.0 - Ruby 2.1.4
- Rails 4.1.0
# How to install and use. # How to install and use.
...@@ -41,15 +40,7 @@ and get ...@@ -41,15 +40,7 @@ and get
-`rendevous` in [Project name] in Consent screen -`rendevous` in [Project name] in Consent screen
## Create and edit config files. ## Dotenv
```
$ cp config/database.yml.example config/database.yml
$ vim config/database.yml
$ cp config/settings.yml.example config/settings.yml
$ vim config/settings.yml
```
## Setup DB ## Setup DB
......
...@@ -32,6 +32,11 @@ module Rendezvous ...@@ -32,6 +32,11 @@ module Rendezvous
# oauth2_token: 'FIXME', # oauth2_token: 'FIXME',
# account: 'FIXME' # account: 'FIXME'
} }
# IP restriction.
if Rails.env.production? && ENV['RV_ALLOW_IPS']
config.middleware.use Rack::Access, { "/" => ENV['RV_ALLOW_IPS'].split(/,/) }
end
end end
end end
# Read Me
# Copy this file to `database.yml` when you run first development.
# $ cp config/detabase.yml.example config/database.yml
development: development:
adapter: mysql2 adapter: mysql2
encoding: utf8 encoding: utf8
reconnect: false reconnect: false
pool: 5 pool: 5
host: localhost url: <%= ENV['DATABASE_URL'] %>
database: rendezvous_development
username: rendezvous
password: rendezvous
test: test:
adapter: mysql2 adapter: mysql2
......
# Read Me
# Copy this file to `settings.yml` when you run first development.
# $ cp config/settings.yml.example config/settings.yml
defaults: &defaults defaults: &defaults
rendezvous: rendezvous:
# For amil body # For amil body
app_host: "http://rendezvous.dev" app_host: <%= ENV['RV_RENDEZVOUS_APP_HOST'] %>
# For login # For login
google_api: google_api:
client_id: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.apps.googleusercontent.com" client_id: <%= ENV['RV_GOOGLE_API_CLIENT_ID'] %>
secret: "xxxxxxxxxxxxxxxxxxxxxxxxxxxx" secret: <%= ENV['RV_GOOGLE_API_SECRET'] %>
# For file upload # For file upload
s3: s3:
access_key_id: "xxxxxxxxxxxxxxxxxxxxx" access_key_id: <%= ENV['RV_S3_ASSESS_KEY_ID'] %>
secret_access_key: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" secret_access_key: <%= ENV['RV_S3_SECRET_ACCESS_KEY'] %>
bucket_name: "xxxxxxxxxxxxxxxxxx" bucket_name: <%= ENV['RV_S3_BACKET_NAME'] %>
# optional # optional
# hipchat: # hipchat:
...@@ -28,7 +24,7 @@ defaults: &defaults ...@@ -28,7 +24,7 @@ defaults: &defaults
# google_analytics: # google_analytics:
# optional # optional
# pdf_uploading: false pdf_uploading: <%= ENV['RV_PDF_UPLOADING'].present? %>
development: development:
<<: *defaults <<: *defaults
......
worker_processes Integer(ENV["WEB_CONCURRENCY"] || 3)
timeout 15
preload_app true
before_fork do |server, worker|
Signal.trap 'TERM' do
puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
Process.kill 'QUIT', Process.pid
end
defined?(ActiveRecord::Base) and
ActiveRecord::Base.connection.disconnect!
end
after_fork do |server, worker|
Signal.trap 'TERM' do
puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to send QUIT'
end
defined?(ActiveRecord::Base) and
ActiveRecord::Base.establish_connection
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment