Merge pull request #213 from coopdevs/feature/cleanup-deployment-stuff

cleanup deployment stuff
This commit is contained in:
Saverio Trioni
2016-05-14 18:35:52 +02:00
5 changed files with 11 additions and 36 deletions
-20
View File
@@ -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
-1
View File
@@ -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'
-4
View File
@@ -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
+10 -10
View File
@@ -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 {}
+1 -1
View File
@@ -1 +1 @@
server "metal.timeoverflow.org", user: "deploy", roles: %w{app db web}
server 'metal.timeoverflow.org', user: 'timeoverflow', roles: %w(app db web)