From e75b215a25dcb1f527bc2e6d43beedb41ae4ff68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 29 Sep 2015 22:13:07 +0200 Subject: fix Capistrano configuration --- config/deploy.rb | 45 +---------------------------------- config/deploy/staging.rb | 62 ------------------------------------------------ 2 files changed, 1 insertion(+), 106 deletions(-) (limited to 'config') diff --git a/config/deploy.rb b/config/deploy.rb index 67eb0c9c..be18ce5a 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -16,51 +16,8 @@ set :log_level, :info set :composer_install_flags, '--no-dev --prefer-dist --no-interaction --optimize-autoloader' set :linked_files, %w{app/config/parameters.yml} -set :linked_dirs, %w{app/logs web/uploads} +set :linked_dirs, %w{app/logs web/uploads data} set :keep_releases, 3 after 'deploy:finishing', 'deploy:cleanup' - -# Default branch is :master -# ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp - -# Default deploy_to directory is /var/www/my_app_name -# set :deploy_to, '/var/www/my_app_name' - -# Default value for :scm is :git -# set :scm, :git - -# Default value for :format is :pretty -# set :format, :pretty - -# Default value for :log_level is :debug -# set :log_level, :debug - -# Default value for :pty is false -# set :pty, true - -# Default value for :linked_files is [] -# set :linked_files, fetch(:linked_files, []).push('config/database.yml', 'config/secrets.yml') - -# Default value for linked_dirs is [] -# set :linked_dirs, fetch(:linked_dirs, []).push('log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'public/system') - -# Default value for default_env is {} -# set :default_env, { path: "/opt/ruby/bin:$PATH" } - -# Default value for keep_releases is 5 -# set :keep_releases, 5 - -namespace :deploy do - - after :restart, :clear_cache do - on roles(:web), in: :groups, limit: 3, wait: 10 do - # Here we can do anything such as: - # within release_path do - # execute :rake, 'cache:clear' - # end - end - end - -end diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb index 76e23bb7..d67d7247 100644 --- a/config/deploy/staging.rb +++ b/config/deploy/staging.rb @@ -1,64 +1,2 @@ -# server-based syntax -# ====================== -# Defines a single server with a list of roles and multiple properties. -# You can define all roles on a single server, or split them: - set :branch, 'v2' set :deploy_to, '/var/www/' - -# server 'example.com', user: 'deploy', roles: %w{app db web}, my_property: :my_value -# server 'example.com', user: 'deploy', roles: %w{app web}, other_property: :other_value -# server 'db.example.com', user: 'deploy', roles: %w{db} - - - -# role-based syntax -# ================== - -# Defines a role with one or multiple servers. The primary server in each -# group is considered to be the first unless any hosts have the primary -# property set. Specify the username and a domain or IP for the server. -# Don't use `:all`, it's a meta role. - -# role :app, %w{deploy@example.com}, my_property: :my_value -# role :web, %w{user1@primary.com user2@additional.com}, other_property: :other_value -# role :db, %w{deploy@example.com} - - - -# Configuration -# ============= -# You can set any configuration variable like in config/deploy.rb -# These variables are then only loaded and set in this stage. -# For available Capistrano configuration variables see the documentation page. -# http://capistranorb.com/documentation/getting-started/configuration/ -# Feel free to add new variables to customise your setup. - - - -# Custom SSH Options -# ================== -# You may pass any option but keep in mind that net/ssh understands a -# limited set of options, consult the Net::SSH documentation. -# http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start -# -# Global options -# -------------- -# set :ssh_options, { -# keys: %w(/home/rlisowski/.ssh/id_rsa), -# forward_agent: false, -# auth_methods: %w(password) -# } -# -# The server-based syntax can be used to override options: -# ------------------------------------ -# server 'example.com', -# user: 'user_name', -# roles: %w{web app}, -# ssh_options: { -# user: 'user_name', # overrides user setting above -# keys: %w(/home/user_name/.ssh/id_rsa), -# forward_agent: false, -# auth_methods: %w(publickey password) -# # password: 'please use keys' -# } -- cgit v1.2.3