aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-10-29 15:36:58 +0200
committerGitHub <noreply@github.com>2016-10-29 15:36:58 +0200
commitca9858537eb0412994b42bdd7ea4f26f7cae96b2 (patch)
tree7cb73fed6103a4106d02e9c30e316051de6b0ce4
parent67b270d9967a023538c7598bfb520dd1007dd2ab (diff)
parentc4b3933bae583da1bdd4b97471bdcca08ab92312 (diff)
downloadwallabag-ca9858537eb0412994b42bdd7ea4f26f7cae96b2.tar.gz
wallabag-ca9858537eb0412994b42bdd7ea4f26f7cae96b2.tar.zst
wallabag-ca9858537eb0412994b42bdd7ea4f26f7cae96b2.zip
Merge pull request #2513 from wallabag/update-capistrano-config
Updated Capistrano configuration
-rw-r--r--Capfile2
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock5
-rw-r--r--app/config/capistrano/deploy.rb9
4 files changed, 8 insertions, 11 deletions
diff --git a/Capfile b/Capfile
index b80a5646..cc807112 100644
--- a/Capfile
+++ b/Capfile
@@ -7,6 +7,8 @@ require 'capistrano/setup'
7# Include default deployment tasks 7# Include default deployment tasks
8require 'capistrano/deploy' 8require 'capistrano/deploy'
9 9
10require 'capistrano/composer'
11require 'capistrano/file-permissions'
10require 'capistrano/symfony' 12require 'capistrano/symfony'
11 13
12# Load custom tasks from `lib/capistrano/tasks` if you have any defined 14# Load custom tasks from `lib/capistrano/tasks` if you have any defined
diff --git a/Gemfile b/Gemfile
index 31f887a9..233be899 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,6 @@
1source "https://rubygems.org" 1source "https://rubygems.org"
2 2
3gem 'capistrano', '~> 3.4' 3gem 'capistrano', '~> 3.4'
4gem 'capistrano-composer'
4gem 'capistrano-symfony', '~> 1.0.0.rc1' 5gem 'capistrano-symfony', '~> 1.0.0.rc1'
5gem 'capistrano-composer', '~> 0.0.3' 6gem 'capistrano-file-permissions'
diff --git a/Gemfile.lock b/Gemfile.lock
index aebbeba2..7b13b399 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,8 +29,9 @@ PLATFORMS
29 29
30DEPENDENCIES 30DEPENDENCIES
31 capistrano (~> 3.4) 31 capistrano (~> 3.4)
32 capistrano-composer (~> 0.0.3) 32 capistrano-composer
33 capistrano-file-permissions
33 capistrano-symfony (~> 1.0.0.rc1) 34 capistrano-symfony (~> 1.0.0.rc1)
34 35
35BUNDLED WITH 36BUNDLED WITH
36 1.11.2 37 1.13.5
diff --git a/app/config/capistrano/deploy.rb b/app/config/capistrano/deploy.rb
index f15eef30..fee04620 100644
--- a/app/config/capistrano/deploy.rb
+++ b/app/config/capistrano/deploy.rb
@@ -1,9 +1,4 @@
1# config valid only for current version of Capistrano 1# config valid only for current version of Capistrano
2lock '3.4.0'
3
4set :log_path, "var/logs"
5set :cache_path, "var/cache"
6set :symfony_console_path, 'bin/console'
7 2
8set :application, 'wallabag' 3set :application, 'wallabag'
9set :repo_url, 'git@github.com:wallabag/wallabag.git' 4set :repo_url, 'git@github.com:wallabag/wallabag.git'
@@ -11,8 +6,6 @@ set :repo_url, 'git@github.com:wallabag/wallabag.git'
11set :ssh_user, 'framasoft_bag' 6set :ssh_user, 'framasoft_bag'
12server '78.46.248.87', user: fetch(:ssh_user), roles: %w{web app db} 7server '78.46.248.87', user: fetch(:ssh_user), roles: %w{web app db}
13 8
14set :scm, :git
15
16set :format, :pretty 9set :format, :pretty
17set :log_level, :info 10set :log_level, :info
18# set :log_level, :debug 11# set :log_level, :debug
@@ -23,4 +16,4 @@ set :linked_files, %w{app/config/parameters.yml}
23set :linked_dirs, [fetch(:log_path), "var/sessions", "web/uploads", "data"] 16set :linked_dirs, [fetch(:log_path), "var/sessions", "web/uploads", "data"]
24set :keep_releases, 3 17set :keep_releases, 3
25 18
26after 'deploy:finishing', 'deploy:cleanup' 19after 'deploy:updated', 'symfony:cache:clear'