diff --git a/Capfile b/Capfile new file mode 100644 index 00000000..9cfa1807 --- /dev/null +++ b/Capfile @@ -0,0 +1,31 @@ +# Load DSL and set up stages +require "capistrano/setup" + +# Include default deployment tasks +require "capistrano/deploy" + +# Include tasks from other gems included in your Gemfile +# +# For documentation on these, see for example: +# +# https://github.com/capistrano/rvm +# https://github.com/capistrano/rbenv +# https://github.com/capistrano/chruby +# https://github.com/capistrano/bundler +# https://github.com/capistrano/rails +# https://github.com/capistrano/passenger +# +# require "capistrano/rvm" +require "capistrano/rbenv" +# require "capistrano/chruby" +require "capistrano/bundler" +require "capistrano/rails" +require "capistrano/rails/assets" +require "capistrano/rails/migrations" +# require "capistrano/passenger" + +# Load custom tasks from `lib/capistrano/tasks` if you have any defined +Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r } +Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r } +Dir.glob('lib/capistrano/**/*.rb').each { |r| import r } + diff --git a/Gemfile b/Gemfile index de22a68c..0fb5f323 100755 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby '2.4.0' +ruby '2.4.1' git_source(:github) do |repo_name| repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") "https://github.com/#{repo_name}.git" diff --git a/config/deploy.rb b/config/deploy.rb index a2144cd1..82cbb71e 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,6 +1,6 @@ lock "3.10.1" -set :application, "sxrestaurant" +set :application, "zsai" set :repo_url, 'git@bitbucket.org:code2lab/sxrestaurant.git' set :deploy_user, 'deploy' diff --git a/config/deploy/production.rb b/config/deploy/production.rb index 9a498da8..7fed1a97 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -5,5 +5,5 @@ set :full_app_name, "#{fetch(:application)}_#{fetch(:stage)}" server '192.168.1.27', user: 'deploy', roles: %w{web app db}, primary: true set :deploy_to, "/home/#{fetch(:deploy_user)}/apps/#{fetch(:full_app_name)}" -set :rbenv_ruby, '2.4.0' +set :rbenv_ruby, '2.4.1' set :rails_env, :production