From c4b3933bae583da1bdd4b97471bdcca08ab92312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sat, 29 Oct 2016 14:14:20 +0200 Subject: [PATCH] Updated Capistrano configuration --- Capfile | 2 ++ Gemfile | 3 ++- Gemfile.lock | 5 +++-- app/config/capistrano/deploy.rb | 9 +-------- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Capfile b/Capfile index b80a5646b..cc8071120 100644 --- a/Capfile +++ b/Capfile @@ -7,6 +7,8 @@ require 'capistrano/setup' # Include default deployment tasks require 'capistrano/deploy' +require 'capistrano/composer' +require 'capistrano/file-permissions' require 'capistrano/symfony' # Load custom tasks from `lib/capistrano/tasks` if you have any defined diff --git a/Gemfile b/Gemfile index 31f887a98..233be899c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ source "https://rubygems.org" gem 'capistrano', '~> 3.4' +gem 'capistrano-composer' gem 'capistrano-symfony', '~> 1.0.0.rc1' -gem 'capistrano-composer', '~> 0.0.3' +gem 'capistrano-file-permissions' diff --git a/Gemfile.lock b/Gemfile.lock index aebbeba27..7b13b3991 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,8 +29,9 @@ PLATFORMS DEPENDENCIES capistrano (~> 3.4) - capistrano-composer (~> 0.0.3) + capistrano-composer + capistrano-file-permissions capistrano-symfony (~> 1.0.0.rc1) BUNDLED WITH - 1.11.2 + 1.13.5 diff --git a/app/config/capistrano/deploy.rb b/app/config/capistrano/deploy.rb index f15eef300..fee04620d 100644 --- a/app/config/capistrano/deploy.rb +++ b/app/config/capistrano/deploy.rb @@ -1,9 +1,4 @@ # config valid only for current version of Capistrano -lock '3.4.0' - -set :log_path, "var/logs" -set :cache_path, "var/cache" -set :symfony_console_path, 'bin/console' set :application, 'wallabag' set :repo_url, 'git@github.com:wallabag/wallabag.git' @@ -11,8 +6,6 @@ set :repo_url, 'git@github.com:wallabag/wallabag.git' set :ssh_user, 'framasoft_bag' server '78.46.248.87', user: fetch(:ssh_user), roles: %w{web app db} -set :scm, :git - set :format, :pretty set :log_level, :info # set :log_level, :debug @@ -23,4 +16,4 @@ set :linked_files, %w{app/config/parameters.yml} set :linked_dirs, [fetch(:log_path), "var/sessions", "web/uploads", "data"] set :keep_releases, 3 -after 'deploy:finishing', 'deploy:cleanup' +after 'deploy:updated', 'symfony:cache:clear'