Skip to content
This repository has been archived by the owner on Mar 5, 2019. It is now read-only.

Capistrano subdir configuration #155

Open
wants to merge 7 commits into
base: capistrano_subdir_configuration
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Argg! too much time working on sysops for Unicorn, switching to Passe…
…nger
John-Mainsys committed Feb 5, 2017
commit 43fadda63121f82b921751b75ed966c950d5a1bd
2 changes: 1 addition & 1 deletion src/ruby/meetings/Capfile
Original file line number Diff line number Diff line change
@@ -20,6 +20,6 @@ require 'rvm1/capistrano3'
require 'capistrano/bundler'
require 'capistrano/rails'
require 'capistrano/rails/migrations'
require 'capistrano3/unicorn'
require 'capistrano/passenger'
# Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
4 changes: 2 additions & 2 deletions src/ruby/meetings/Gemfile
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ gem 'jbuilder', '~> 2.5'
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

gem 'unicorn'
gem "passenger", ">= 5.0.25", require: "phusion_passenger/rack_handler"
gem 'draper', "3.0.0.pre1"

gem 'bootstrap', '~> 4.0.0.alpha4'
@@ -60,7 +60,7 @@ group :development do
gem 'capistrano', '~> 3.6'
gem 'capistrano-rails', '~> 1.1'
gem 'capistrano-bundler', '~> 1.1.2'
gem 'capistrano3-unicorn'
gem 'capistrano-passenger'
gem 'railroady'
gem 'rvm1-capistrano3', require: false
gem 'git'
16 changes: 7 additions & 9 deletions src/ruby/meetings/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -72,11 +72,11 @@ GEM
capistrano (~> 3.1)
sshkit (~> 1.2)
capistrano-harrow (0.5.3)
capistrano-passenger (0.2.0)
capistrano (~> 3.0)
capistrano-rails (1.2.2)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
capistrano3-unicorn (0.2.1)
capistrano (~> 3.1, >= 3.1.0)
capybara (2.11.0)
addressable
mime-types (>= 1.16)
@@ -200,7 +200,6 @@ GEM
activerecord
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
kgio (2.11.0)
launchy (2.4.3)
addressable (~> 2.3)
listen (3.0.8)
@@ -238,6 +237,9 @@ GEM
nio4r (1.2.1)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
passenger (5.1.2)
rack
rake (>= 0.8.1)
pg (0.19.0)
poltergeist (1.12.0)
capybara (~> 2.1)
@@ -278,7 +280,6 @@ GEM
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.17.0)
rake (12.0.0)
rb-fsevent (0.9.8)
rb-inotify (0.9.7)
@@ -380,9 +381,6 @@ GEM
uglifier (3.0.4)
execjs (>= 0.3.0, < 3)
unicode_utils (1.4.0)
unicorn (5.2.0)
kgio (~> 2.6)
raindrops (~> 0.7)
web-console (3.4.0)
actionview (>= 5.0)
activemodel (>= 5.0)
@@ -410,8 +408,8 @@ DEPENDENCIES
byebug
capistrano (~> 3.6)
capistrano-bundler (~> 1.1.2)
capistrano-passenger
capistrano-rails (~> 1.1)
capistrano3-unicorn
capybara
coffee-rails (~> 4.2)
country_select
@@ -432,6 +430,7 @@ DEPENDENCIES
launchy
listen (~> 3.0.5)
mailcatcher
passenger (>= 5.0.25)
pg (~> 0.18)
poltergeist
puma (~> 3.0)
@@ -456,7 +455,6 @@ DEPENDENCIES
syntax
turbolinks (~> 5)
uglifier (>= 1.3.0)
unicorn
web-console
webmock

2 changes: 1 addition & 1 deletion src/ruby/meetings/config/environments/staging.rb
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@

# Disable serving static files from the `/public` folder by default since
# Apache or NGINX already handles this.
config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?

# Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier
38 changes: 0 additions & 38 deletions src/ruby/meetings/config/unicorn/production.rb

This file was deleted.

38 changes: 0 additions & 38 deletions src/ruby/meetings/config/unicorn/staging.rb

This file was deleted.