From 860a557a98ff170258078d19a08e4410916b6c4d Mon Sep 17 00:00:00 2001
From: John-Mainsys <john@faversham-mainsys>
Date: Sat, 4 Feb 2017 19:49:59 +0000
Subject: [PATCH 1/7] updates for deploying a subtree

---
 src/ruby/meetings/.ruby-version            |  2 +-
 src/ruby/meetings/Capfile                  |  2 +-
 src/ruby/meetings/Gemfile                  | 68 ++++++++--------------
 src/ruby/meetings/Gemfile.lock             | 55 ++++-------------
 src/ruby/meetings/config/deploy.rb         |  7 ++-
 src/ruby/meetings/config/deploy/staging.rb |  2 +-
 6 files changed, 44 insertions(+), 92 deletions(-)

diff --git a/src/ruby/meetings/.ruby-version b/src/ruby/meetings/.ruby-version
index c1026d2..bed811b 100644
--- a/src/ruby/meetings/.ruby-version
+++ b/src/ruby/meetings/.ruby-version
@@ -1 +1 @@
-ruby-2.3.1
+ruby-2.3.3
diff --git a/src/ruby/meetings/Capfile b/src/ruby/meetings/Capfile
index d51ef1f..412d7c0 100644
--- a/src/ruby/meetings/Capfile
+++ b/src/ruby/meetings/Capfile
@@ -20,6 +20,6 @@ require 'rvm1/capistrano3'
 require 'capistrano/bundler'
 require 'capistrano/rails'
 require 'capistrano/rails/migrations'
-
+require 'capistrano3/unicorn'
 # Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
diff --git a/src/ruby/meetings/Gemfile b/src/ruby/meetings/Gemfile
index 107c5a6..2c55291 100644
--- a/src/ruby/meetings/Gemfile
+++ b/src/ruby/meetings/Gemfile
@@ -1,17 +1,10 @@
 # Avoid warnings about the git protocol being insecure when using github repos.
 # https://github.com/bundler/bundler/issues/4978
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
-  "https://github.com/#{repo_name}.git"
-end
-
-source 'https://rubygems.org'
 #https://github.com/twbs/bootstrap-rubygem
+source 'https://rubygems.org'
 source 'https://rails-assets.org' do
     gem 'rails-assets-tether', '>= 1.1.0'
 end
-
-
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.0.0', '>= 5.0.0.1'
 # Use postgresql as the database for Active Record
@@ -42,41 +35,41 @@ gem 'jbuilder', '~> 2.5'
 # gem 'capistrano-rails', group: :development
 
 gem 'unicorn'
-
-group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug', platform: :mri
-end
-
-group :development do
-  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
-  gem 'web-console'
-  gem 'listen', '~> 3.0.5'
-  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
-  gem 'spring'
-  gem 'spring-watcher-listen', '~> 2.0.0'
-end
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem 'draper', "3.0.0.pre1"
 
 gem 'bootstrap', '~> 4.0.0.alpha4'
-gem 'carrierwave'
-gem 'mini_magick'
-gem 'draper', github: 'drapergem/draper'
 gem 'haml-rails'
 gem 'country_select'
 gem 'kaminari'
 gem "htmlentities"
-gem 'factory_girl_rails'
 gem 'active_model_serializers', '~> 0.10.0'
 gem 'activemodel-serializers-xml'
 gem 'swagger-blocks'
 gem 'jsonapi-resources'
-gem 'globalize', github: 'JohnSmall/globalize'
-gem 'rack-cors', :require => 'rack/cors'
+
+group :development do
+  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
+  gem 'web-console'
+  gem 'listen', '~> 3.0.5'
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
+# Use Capistrano for deployment
+# gem 'capistrano-rails', group: :development
+  gem 'capistrano', '~> 3.6'
+  gem 'capistrano-rails', '~> 1.1'
+  gem 'capistrano-bundler', '~> 1.1.2'
+  gem 'capistrano3-unicorn'
+  gem 'railroady'
+  gem 'rvm1-capistrano3', require: false
+  gem 'git'
+  gem 'spring-commands-rspec'
+  gem 'spring-commands-cucumber'
+  #gem 'capistrano-git-submodule-strategy', '~> 0.1', :github => 'ekho/capistrano-git-submodule-strategy'
+end
 
 group :development, :test do
+  gem 'byebug', platform: :mri
   gem 'mailcatcher'
   gem 'syntax'
   gem 'rspec-rails'
@@ -84,9 +77,9 @@ group :development, :test do
   gem 'cucumber-rails', require: false
   gem 'awesome_print'
   gem 'webmock'
-  gem 'capistrano-git-submodule-strategy', '~> 0.1', github: 'ekho/capistrano-git-submodule-strategy'
   gem 'faraday'
   gem 'jsonpath'
+  gem 'factory_girl_rails'
 end
 
 group :test do
@@ -102,14 +95,3 @@ group :test do
   gem 'rails-controller-testing'
 end
 
-group :development do
-  gem 'capistrano', '~> 3.6'
-  gem 'capistrano-rails', '~> 1.1'
-  gem 'capistrano-bundler', '~> 1.1.2'
-  gem 'capistrano-passenger'
-  gem 'railroady'
-  gem 'rvm1-capistrano3', require: false
-  gem 'git'
-  gem 'spring-commands-rspec'
-  gem 'spring-commands-cucumber'
-end
diff --git a/src/ruby/meetings/Gemfile.lock b/src/ruby/meetings/Gemfile.lock
index ae862b3..eaa211f 100644
--- a/src/ruby/meetings/Gemfile.lock
+++ b/src/ruby/meetings/Gemfile.lock
@@ -1,30 +1,3 @@
-GIT
-  remote: https://github.com/JohnSmall/globalize.git
-  revision: 7d507472e4076c720d798736137eb28d169eb1a1
-  specs:
-    globalize (5.1.0)
-      activemodel (>= 4.2, < 5.1)
-      activerecord (>= 4.2, < 5.1)
-      request_store (~> 1.0)
-
-GIT
-  remote: https://github.com/drapergem/draper.git
-  revision: ab51bf06d111c6278bd3bc0ca781655ae61cc4b9
-  specs:
-    draper (3.0.0.pre1)
-      actionpack (~> 5.0)
-      activemodel (~> 5.0)
-      activemodel-serializers-xml (~> 1.0)
-      activesupport (~> 5.0)
-      request_store (~> 1.0)
-
-GIT
-  remote: https://github.com/ekho/capistrano-git-submodule-strategy.git
-  revision: 559f6b08992027b2380a54b1b4b4cf55a3f10680
-  specs:
-    capistrano-git-submodule-strategy (0.1.23)
-      capistrano (>= 3.1.0, < 3.7)
-
 GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
@@ -99,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)
@@ -111,10 +84,6 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    carrierwave (1.0.0)
-      activemodel (>= 4.0.0)
-      activesupport (>= 4.0.0)
-      mime-types (>= 1.16)
     case_transform (0.2)
       activesupport
     childprocess (0.5.9)
@@ -159,6 +128,12 @@ GEM
     database_cleaner (1.5.3)
     debug_inspector (0.0.2)
     diff-lcs (1.3)
+    draper (3.0.0.pre1)
+      actionpack (~> 5.0)
+      activemodel (~> 5.0)
+      activemodel-serializers-xml (~> 1.0)
+      activesupport (~> 5.0)
+      request_store (~> 1.0)
     email_spec (2.1.0)
       htmlentities (~> 4.3.3)
       launchy (~> 2.1)
@@ -249,7 +224,6 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_magick (4.6.0)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
     money (6.8.1)
@@ -272,7 +246,6 @@ GEM
     public_suffix (2.0.5)
     puma (3.6.2)
     rack (2.0.1)
-    rack-cors (0.4.0)
     rack-test (0.6.3)
       rack (>= 1.0)
     railroady (1.5.2)
@@ -436,21 +409,18 @@ DEPENDENCIES
   byebug
   capistrano (~> 3.6)
   capistrano-bundler (~> 1.1.2)
-  capistrano-git-submodule-strategy (~> 0.1)!
-  capistrano-passenger
   capistrano-rails (~> 1.1)
+  capistrano3-unicorn
   capybara
-  carrierwave
   coffee-rails (~> 4.2)
   country_select
   cucumber-rails
   database_cleaner
-  draper!
+  draper (= 3.0.0.pre1)
   email_spec
   factory_girl_rails
   faraday
   git
-  globalize!
   haml-rails
   htmlentities
   jbuilder (~> 2.5)
@@ -461,11 +431,9 @@ DEPENDENCIES
   launchy
   listen (~> 3.0.5)
   mailcatcher
-  mini_magick
   pg (~> 0.18)
   poltergeist
   puma (~> 3.0)
-  rack-cors
   railroady
   rails (~> 5.0.0, >= 5.0.0.1)
   rails-assets-tether (>= 1.1.0)!
@@ -485,11 +453,10 @@ DEPENDENCIES
   swagger-blocks
   syntax
   turbolinks (~> 5)
-  tzinfo-data
   uglifier (>= 1.3.0)
   unicorn
   web-console
   webmock
 
 BUNDLED WITH
-   1.14.0
+   1.14.3
diff --git a/src/ruby/meetings/config/deploy.rb b/src/ruby/meetings/config/deploy.rb
index 13db49e..2120db5 100644
--- a/src/ruby/meetings/config/deploy.rb
+++ b/src/ruby/meetings/config/deploy.rb
@@ -1,4 +1,8 @@
 # config valid only for Capistrano 3.1
+# See http://stackoverflow.com/questions/29168/deploying-a-git-subdirectory-in-capistrano/6969505#6969505 for instructions on how
+# to install from a subdirection
+# As of Capistrano 3.3.3, you can now use the :repo_tree configuration variable,
+# http://capistranorb.com/documentation/getting-started/configuration/
 lock '3.6.1'
 set :application, ->{YAML.load_file('config/deploy.yml')[fetch(:stage)][:directory]}
 set :repo_url, ->{YAML.load_file('config/deploy.yml')[fetch(:stage)][:repo_url]}
@@ -8,11 +12,10 @@
 # ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call
 
 # Default deploy_to directory is /var/www/my_app
-set :deploy_to, "/home/rails/muti/#{fetch(:stage)}"
+set :deploy_to, "/home/rails/muti_tree/#{fetch(:stage)}"
 
 # Default value for :scm is :git
 # set :scm, :git
-set :git_strategy, Capistrano::Git::SubmoduleStrategy
 set :repo_tree, 'src/ruby/meetings'
 # Default value for :format is :pretty
 # set :format, :pretty
diff --git a/src/ruby/meetings/config/deploy/staging.rb b/src/ruby/meetings/config/deploy/staging.rb
index c40a5bf..b525ac0 100644
--- a/src/ruby/meetings/config/deploy/staging.rb
+++ b/src/ruby/meetings/config/deploy/staging.rb
@@ -16,7 +16,7 @@
 # server list. The second argument is a, or duck-types, Hash and is
 # used to set extended properties on the server.
 set :domain,YAML.load_file('config/deploy.yml')[fetch(:stage)][:domain]
-server fetch(:domain), user: 'ubuntu', roles: %w{db web app}#, my_property: :my_value
+server fetch(:domain), user: 'rails', roles: %w{db web app}#, my_property: :my_value
 
 
 

From 8519935e36c533759330a41fd2e8dd77080e7f19 Mon Sep 17 00:00:00 2001
From: John-Mainsys <john@faversham-mainsys>
Date: Sat, 4 Feb 2017 20:17:06 +0000
Subject: [PATCH 2/7] added rack_cors gem to Gemfile

---
 src/ruby/meetings/Gemfile      | 1 +
 src/ruby/meetings/Gemfile.lock | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/ruby/meetings/Gemfile b/src/ruby/meetings/Gemfile
index 2c55291..ae87476 100644
--- a/src/ruby/meetings/Gemfile
+++ b/src/ruby/meetings/Gemfile
@@ -46,6 +46,7 @@ gem 'active_model_serializers', '~> 0.10.0'
 gem 'activemodel-serializers-xml'
 gem 'swagger-blocks'
 gem 'jsonapi-resources'
+gem 'rack-cors', :require => 'rack/cors'
 
 group :development do
   # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
diff --git a/src/ruby/meetings/Gemfile.lock b/src/ruby/meetings/Gemfile.lock
index eaa211f..3dfdfe7 100644
--- a/src/ruby/meetings/Gemfile.lock
+++ b/src/ruby/meetings/Gemfile.lock
@@ -246,6 +246,7 @@ GEM
     public_suffix (2.0.5)
     puma (3.6.2)
     rack (2.0.1)
+    rack-cors (0.4.0)
     rack-test (0.6.3)
       rack (>= 1.0)
     railroady (1.5.2)
@@ -434,6 +435,7 @@ DEPENDENCIES
   pg (~> 0.18)
   poltergeist
   puma (~> 3.0)
+  rack-cors
   railroady
   rails (~> 5.0.0, >= 5.0.0.1)
   rails-assets-tether (>= 1.1.0)!

From 866f391b9ec856259b7a7904ffabcfdb7b69cc46 Mon Sep 17 00:00:00 2001
From: John-Mainsys <john@faversham-mainsys>
Date: Sat, 4 Feb 2017 20:21:14 +0000
Subject: [PATCH 3/7] change unicorn socket

---
 src/ruby/meetings/config/unicorn/staging.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ruby/meetings/config/unicorn/staging.rb b/src/ruby/meetings/config/unicorn/staging.rb
index 38c6659..8f73c69 100644
--- a/src/ruby/meetings/config/unicorn/staging.rb
+++ b/src/ruby/meetings/config/unicorn/staging.rb
@@ -10,7 +10,7 @@
 timeout 30
 preload_app true
 
-listen '/tmp/unicorn.muti.staging.sock', backlog: 64
+listen '/tmp/unicorn.muti.staging_2.sock', backlog: 64
 
 before_fork do |server, worker|
   Signal.trap 'TERM' do

From d75333514db8430e52ddc2bd0b91a0ade0390692 Mon Sep 17 00:00:00 2001
From: John-Mainsys <john@faversham-mainsys>
Date: Sun, 5 Feb 2017 11:02:20 +0000
Subject: [PATCH 4/7] updated unicorn configuration

---
 src/ruby/meetings/config/unicorn/staging.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ruby/meetings/config/unicorn/staging.rb b/src/ruby/meetings/config/unicorn/staging.rb
index 8f73c69..852fa2e 100644
--- a/src/ruby/meetings/config/unicorn/staging.rb
+++ b/src/ruby/meetings/config/unicorn/staging.rb
@@ -1,4 +1,4 @@
-root = "/home/rails/muti/staging/current"
+root = "/home/rails/muti_tree/staging/current"
 working_directory root
 
 pid "#{root}/tmp/pids/unicorn.pid"
@@ -10,7 +10,7 @@
 timeout 30
 preload_app true
 
-listen '/tmp/unicorn.muti.staging_2.sock', backlog: 64
+listen '/tmp/unicorn.muti_tree.staging.sock', backlog: 64
 
 before_fork do |server, worker|
   Signal.trap 'TERM' do

From 43fadda63121f82b921751b75ed966c950d5a1bd Mon Sep 17 00:00:00 2001
From: John-Mainsys <john@faversham-mainsys>
Date: Sun, 5 Feb 2017 15:02:04 +0000
Subject: [PATCH 5/7] Argg! too much time working on sysops for Unicorn,
 switching to Passenger

---
 src/ruby/meetings/Capfile                     |  2 +-
 src/ruby/meetings/Gemfile                     |  4 +-
 src/ruby/meetings/Gemfile.lock                | 16 ++++----
 .../meetings/config/environments/staging.rb   |  2 +-
 .../meetings/config/unicorn/production.rb     | 38 -------------------
 src/ruby/meetings/config/unicorn/staging.rb   | 38 -------------------
 6 files changed, 11 insertions(+), 89 deletions(-)
 delete mode 100644 src/ruby/meetings/config/unicorn/production.rb
 delete mode 100644 src/ruby/meetings/config/unicorn/staging.rb

diff --git a/src/ruby/meetings/Capfile b/src/ruby/meetings/Capfile
index 412d7c0..deeafa9 100644
--- a/src/ruby/meetings/Capfile
+++ b/src/ruby/meetings/Capfile
@@ -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 }
diff --git a/src/ruby/meetings/Gemfile b/src/ruby/meetings/Gemfile
index ae87476..13521c1 100644
--- a/src/ruby/meetings/Gemfile
+++ b/src/ruby/meetings/Gemfile
@@ -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'
diff --git a/src/ruby/meetings/Gemfile.lock b/src/ruby/meetings/Gemfile.lock
index 3dfdfe7..ae76344 100644
--- a/src/ruby/meetings/Gemfile.lock
+++ b/src/ruby/meetings/Gemfile.lock
@@ -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
 
diff --git a/src/ruby/meetings/config/environments/staging.rb b/src/ruby/meetings/config/environments/staging.rb
index 564977c..8aef815 100644
--- a/src/ruby/meetings/config/environments/staging.rb
+++ b/src/ruby/meetings/config/environments/staging.rb
@@ -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
diff --git a/src/ruby/meetings/config/unicorn/production.rb b/src/ruby/meetings/config/unicorn/production.rb
deleted file mode 100644
index 5efeea8..0000000
--- a/src/ruby/meetings/config/unicorn/production.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-root = "/home/rails/muti/staging/current"
-working_directory root
-
-pid "#{root}/tmp/pids/unicorn.pid"
-
-stderr_path "#{root}/log/unicorn.log"
-stdout_path "#{root}/log/unicorn.log"
-
-worker_processes 4
-timeout 30
-preload_app true
-
-listen '/tmp/unicorn.muti.sock', backlog: 64
-
-before_fork do |server, worker|
-  Signal.trap 'TERM' do
-    puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
-    Process.kill 'QUIT', Process.pid
-  end
-
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.connection.disconnect!
-end
-
-after_fork do |server, worker|
-  Signal.trap 'TERM' do
-    puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to send QUIT'
-  end
-
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.establish_connection
-end
-
-# Force the bundler gemfile environment variable to
-# # reference the capistrano "current" symlink
-before_exec do |_|
-  ENV['BUNDLE_GEMFILE'] = File.join(root, 'Gemfile')
-end
diff --git a/src/ruby/meetings/config/unicorn/staging.rb b/src/ruby/meetings/config/unicorn/staging.rb
deleted file mode 100644
index 852fa2e..0000000
--- a/src/ruby/meetings/config/unicorn/staging.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-root = "/home/rails/muti_tree/staging/current"
-working_directory root
-
-pid "#{root}/tmp/pids/unicorn.pid"
-
-stderr_path "#{root}/log/unicorn.log"
-stdout_path "#{root}/log/unicorn.log"
-
-worker_processes 4
-timeout 30
-preload_app true
-
-listen '/tmp/unicorn.muti_tree.staging.sock', backlog: 64
-
-before_fork do |server, worker|
-  Signal.trap 'TERM' do
-    puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
-    Process.kill 'QUIT', Process.pid
-  end
-
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.connection.disconnect!
-end
-
-after_fork do |server, worker|
-  Signal.trap 'TERM' do
-    puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to send QUIT'
-  end
-
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.establish_connection
-end
-
-# Force the bundler gemfile environment variable to
-# # reference the capistrano "current" symlink
-before_exec do |_|
-  ENV['BUNDLE_GEMFILE'] = File.join(root, 'Gemfile')
-end

From 4f1662e2df96829ccbd79432009a131ec90d6971 Mon Sep 17 00:00:00 2001
From: John-Mainsys <john@faversham-mainsys>
Date: Sun, 19 Feb 2017 10:51:56 +0000
Subject: [PATCH 6/7] removed references to unicorn

---
 src/ruby/meetings/config/deploy.rb | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/src/ruby/meetings/config/deploy.rb b/src/ruby/meetings/config/deploy.rb
index 2120db5..ff0f8ae 100644
--- a/src/ruby/meetings/config/deploy.rb
+++ b/src/ruby/meetings/config/deploy.rb
@@ -27,7 +27,7 @@
 # set :pty, true
 
 # Default value for :linked_files is []
-set :linked_files, ['config/database.yml','config/secrets.yml','config/deploy.yml','config/environment_params.yml']
+set :linked_files, ['config/database.yml','config/secrets.yml','config/environment_params.yml']
 
 # Default value for linked_dirs is []
 set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system public/uploads}
@@ -38,24 +38,5 @@
 # Default value for keep_releases is 5
 # set :keep_releases, 5
 
-namespace :deploy do
-  desc 'Restart application'
-  task :restart do
-    on roles(:app), in: :sequence, wait: 5 do
-      # Your restart mechanism here, for example:
-      invoke 'unicorn:reload'
-    end
-  end
-  after :publishing, :restart
-
-  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
+
+

From 404993fd8356db15845118d051ea644d495b6c1c Mon Sep 17 00:00:00 2001
From: John-Mainsys <john@faversham-mainsys>
Date: Sun, 19 Feb 2017 10:52:18 +0000
Subject: [PATCH 7/7] use ruby 2.4.0

---
 src/ruby/meetings/.ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ruby/meetings/.ruby-version b/src/ruby/meetings/.ruby-version
index bed811b..262714f 100644
--- a/src/ruby/meetings/.ruby-version
+++ b/src/ruby/meetings/.ruby-version
@@ -1 +1 @@
-ruby-2.3.3
+ruby-2.4.0