diff --git a/Capfile b/Capfile index ac683a4..d4ea862 100644 --- a/Capfile +++ b/Capfile @@ -5,31 +5,10 @@ require "capistrano/setup" require "capistrano/deploy" # Load the SCM plugin appropriate to your project: -# -# require "capistrano/scm/hg" -# install_plugin Capistrano::SCM::Hg -# or -# require "capistrano/scm/svn" -# install_plugin Capistrano::SCM::Svn -# or require "capistrano/scm/git" install_plugin Capistrano::SCM::Git -# 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/assets" require "capistrano/rails/migrations" # require "capistrano/passenger" diff --git a/Gemfile b/Gemfile index 7f8f4c3..ca53a65 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ group :development do gem "web-console" gem "rack-mini-profiler" gem "capistrano", "~> 3.17", require: false - gem 'capistrano-rbenv' + gem 'capistrano-rbenv' , require: false gem "capistrano-rails", require: false end diff --git a/config/deploy.rb b/config/deploy.rb index 5d4c307..7373d62 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -5,7 +5,7 @@ set :application, "gateway" set :repo_url, "https://github.com/rubydesign/gateway.git" # Default branch is :master -# ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp +set :branch, :main # Default deploy_to directory is /var/www/my_app_name set :deploy_to, "/home/feenix/gateway" diff --git a/config/deploy/production.rb b/config/deploy/production.rb index 4e1ef8d..7ffdc6c 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -5,6 +5,6 @@ user: "feenix", roles: %w{web app db}, ssh_options: { - auth_methods: %w(publickey) +# auth_methods: %w(publickey) # password: "please use keys" }