Compare commits

..

No commits in common. "76dcd88ce830a0e20a871ab9732701f31cd2f4fd" and "4e9e8f96efbe887de4ee3e8f1d28c73a0001f22c" have entirely different histories.

3 changed files with 3 additions and 7 deletions

2
.gitignore vendored
View File

@ -4,8 +4,6 @@
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'
/.DS_Store
# Ignore bundler config.
/.bundle

View File

@ -30,8 +30,8 @@ require "capistrano/rvm"
# require "capistrano/rbenv"
# require "capistrano/chruby"
require "capistrano/rails/assets"
require 'capistrano/nginx'
require "capistrano/bundler"
require "capistrano/rails/migrations"
# require "capistrano/passenger"

View File

@ -4,8 +4,8 @@ set :stage, :production
server "quartz.snlab.fr", user: "web", roles: %w{web app db}
set :branch, ENV["REVISION"] || ENV["BRANCH_NAME"] || "master"
puts stage_config_path
set :nginx_template, "#{stage_config_path}/#{fetch :stage}/nginx.conf.erb"
# server-based syntax
# ======================
@ -43,8 +43,6 @@ set :deploy_to, "/srv/www/web/#{fetch(:application)}/"
set :repo_url, "git@quartz.snlab.fr:nicolas/#{fetch(:application)}.git"
append :linked_files, "config/master.key"
# Custom SSH Options
# ==================