Commit 0dd02fbf authored by jz143's avatar jz143

pre-deploy config changes; use puma rather than passenger

parent 5c5e424d
......@@ -31,12 +31,14 @@ gem 'sdoc', '~> 0.4.0', group: :doc
# Use Unicorn as the app server
# gem 'unicorn'
gem 'puma'
# Use Capistrano for deployment
group :development do
gem 'capistrano-rvm'
gem 'capistrano-rails', '~> 1.1'
gem 'capistrano-bundler', '~> 1.1.2'
gem 'capistrano-passenger', '~> 0.1.1'
gem 'capistrano3-puma'
end
# Use database for session store
......@@ -73,9 +75,6 @@ gem "pundit"
# generate plist on the fly
gem "plist", :git => "https://github.com/jiehanzheng/plist.git", :ref => "8dc72ad"
# post certain update events on slack
gem "slack-notifier", '~> 1.5.1'
gem "omniauth", '~> 1.3.1'
gem "omniauth-duke-oauth2", :git => 'git@gitlab.oit.duke.edu:colab/omniauth-duke-oauth2.git', :ref => '5eaf6759'
......
......@@ -74,14 +74,15 @@ GEM
capistrano-bundler (1.1.4)
capistrano (~> 3.1)
sshkit (~> 1.2)
capistrano-passenger (0.1.1)
capistrano (~> 3.0)
capistrano-rails (1.1.5)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
capistrano-rvm (0.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
capistrano3-puma (1.2.1)
capistrano (~> 3.0)
puma (>= 2.6)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.7)
......@@ -153,6 +154,7 @@ GEM
cocaine (~> 0.5.5)
mime-types
mimemagic (= 0.3.0)
puma (3.1.1)
pundit (1.0.1)
activesupport (>= 3.0.0)
rack (1.6.4)
......@@ -213,7 +215,6 @@ GEM
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
slack-notifier (1.5.1)
spring (1.3.6)
sprockets (3.3.3)
rack (~> 1.0)
......@@ -255,9 +256,9 @@ DEPENDENCIES
bootstrap-sass (~> 3.3.5)
byebug
capistrano-bundler (~> 1.1.2)
capistrano-passenger (~> 0.1.1)
capistrano-rails (~> 1.1)
capistrano-rvm
capistrano3-puma
coffee-rails (~> 4.1.0)
config (~> 1.0.0)
jbuilder (~> 2.0)
......@@ -269,13 +270,13 @@ DEPENDENCIES
omniauth-duke-oauth2!
paperclip (~> 4.3)
plist!
puma
pundit
rails (= 4.2.4)
resque (~> 1.26.0)
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
simple_form
slack-notifier (~> 1.5.1)
spring
sqlite3
therubyracer
......
......@@ -39,12 +39,12 @@ namespace :deploy do
end
# TODO: need to update shared_path because it's different from Debian paths
# on roles(:ios_sign) do
# # provisioning profiles
# execute :mkdir, '-p', "#{shared_path}/resources/ios_provisioning_profiles"
# upload! 'resources/ios_provisioning_profiles/CoLab_Member_Apps_20151.mobileprovision',
# "#{shared_path}/resources/ios_provisioning_profiles/CoLab_Member_Apps_20151.mobileprovision"
# end
on roles(:ios_sign) do
# provisioning profiles
execute :mkdir, '-p', "#{shared_path}/resources/ios_provisioning_profiles"
upload! 'resources/ios_provisioning_profiles/CoLab_Member_Apps_20151.mobileprovision',
"#{shared_path}/resources/ios_provisioning_profiles/CoLab_Member_Apps_20151.mobileprovision"
end
end
before 'deploy:check:linked_dirs', :upload_config
......
role :app, %w{appstore@appstore.colab.duke.edu}
role :web, %w{appstore@appstore.colab.duke.edu}
role :db, %w{appstore@appstore.colab.duke.edu}
# role :ios_sign, %w{appstore@istudio-osxserver.oit.duke.edu}
role :ios_sign, %w{appstore-mac.colab.managed.jiehan.org}, {
:deploy_to => '/Users/appstore/appstore'
}
set :rvm_ruby_version, '2.2.1'
......@@ -2,5 +2,5 @@ web:
host: appstore.colab.duke.edu
user: appstore
signing_worker:
host: istudio-osxserver.oit.duke.edu
host: appstore-mac.colab.managed.jiehan.org
user: appstore
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