From d5cdb45812c88ba4dda04bd0087f942d060ae52f Mon Sep 17 00:00:00 2001 From: Saverio Trioni Date: Sat, 14 May 2016 00:02:39 +0200 Subject: [PATCH 1/3] Deployment: remove shellycloud config --- Cloudfile | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 Cloudfile diff --git a/Cloudfile b/Cloudfile deleted file mode 100644 index c259b7a..0000000 --- a/Cloudfile +++ /dev/null @@ -1,20 +0,0 @@ -timeoverflow: - ruby_version: 2.2.2 - environment: production # RAILS_ENV - monitoring_email: saverio.trioni@gmail.com - domains: - - timeoverflow.shellyapp.com - - www.timeoverflow.org - servers: - app1: - size: small - thin: 4 - # delayed_job: 1 - # sidekiq: 1 - # clockwork: on - whenever: on - # elasticsearch: on - databases: - - postgresql - # - mongodb - # - redis From 1d9f1cf1aa27715eb5e254bfd7be97fc97e0b7b0 Mon Sep 17 00:00:00 2001 From: Saverio Trioni Date: Sat, 14 May 2016 00:04:52 +0200 Subject: [PATCH 2/3] Deployment: update server config --- config/deploy.rb | 20 ++++++++++---------- config/deploy/production.rb | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/deploy.rb b/config/deploy.rb index e8a80c7..f7943b6 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,8 +1,8 @@ # config valid only for current version of Capistrano -lock "3.4.0" +lock '3.4.0' -set :application, "timeoverflow" -set :repo_url, "git@github.com:coopdevs/timeoverflow.git" +set :application, 'timeoverflow' +set :repo_url, 'git@github.com:coopdevs/timeoverflow.git' # Default branch is :master # ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp @@ -26,17 +26,17 @@ set :repo_url, "git@github.com:coopdevs/timeoverflow.git" set :linked_files, fetch(:linked_files, []).push( # "config/database.yml", # "config/secrets.yml", - ".env", + # ".env", ) # Default value for linked_dirs is [] set :linked_dirs, fetch(:linked_dirs, []).push( - "log", - "tmp/pids", - "tmp/cache", - "tmp/sockets", - "vendor/bundle", - "public/system" + 'log', + 'tmp/pids', + 'tmp/cache', + 'tmp/sockets', + 'vendor/bundle', + 'public/system' ) # Default value for default_env is {} diff --git a/config/deploy/production.rb b/config/deploy/production.rb index 13da887..a740b3a 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -1 +1 @@ -server "metal.timeoverflow.org", user: "deploy", roles: %w{app db web} +server 'metal.timeoverflow.org', user: 'timeoverflow', roles: %w(app db web) From 200c58abc85f294a387046154001f982af323991 Mon Sep 17 00:00:00 2001 From: Saverio Trioni Date: Sat, 14 May 2016 18:26:15 +0200 Subject: [PATCH 3/3] Deployment: remove shelly-dependencies gem --- Gemfile | 1 - Gemfile.lock | 4 ---- 2 files changed, 5 deletions(-) diff --git a/Gemfile b/Gemfile index 0881886..f2057ab 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,6 @@ gem "awesome_print" gem 'memcachier' gem 'rollbar', '2.8.3' gem 'travis-lint' -gem "shelly-dependencies" gem 'whenever', :require => false gem 'prawn' gem 'prawn-table' diff --git a/Gemfile.lock b/Gemfile.lock index 685eafa..f2c7fd9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -310,9 +310,6 @@ GEM select2-rails (4.0.1) thor (~> 0.14) sexp_processor (4.4.4) - shelly-dependencies (0.2.4) - rake - thin shoulda (3.5.0) shoulda-context (~> 1.0, >= 1.0.1) shoulda-matchers (>= 1.4.1, < 3.0) @@ -423,7 +420,6 @@ DEPENDENCIES rubocop sass-rails (~> 5.0.1) select2-rails - shelly-dependencies shoulda (>= 3.5) simple_form (>= 3.0.0) slim-rails