Skip to content

wattsworth / lumen-api

Go to a project
Commit bc64f00a by John Donnal
Options

updated rails to address mimemagic licensing error and updated capistrano deployment scripts

parent 100ae0e0
Inline Side-by-side
Showing with 68 additions and 67 deletions
Gemfile
...@@ -2,7 +2,7 @@ source 'https://rubygems.org' ...@@ -2,7 +2,7 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0' gem 'rails', '~> 6.0.3.6'
# Use SCSS for stylesheets # Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0' gem 'sass-rails', '~> 5.0'
......
Gemfile.lock
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (6.0.3.4) actioncable (6.0.3.6)
actionpack (= 6.0.3.4) actionpack (= 6.0.3.6)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (6.0.3.4) actionmailbox (6.0.3.6)
actionpack (= 6.0.3.4) actionpack (= 6.0.3.6)
activejob (= 6.0.3.4) activejob (= 6.0.3.6)
activerecord (= 6.0.3.4) activerecord (= 6.0.3.6)
activestorage (= 6.0.3.4) activestorage (= 6.0.3.6)
activesupport (= 6.0.3.4) activesupport (= 6.0.3.6)
mail (>= 2.7.1) mail (>= 2.7.1)
actionmailer (6.0.3.4) actionmailer (6.0.3.6)
actionpack (= 6.0.3.4) actionpack (= 6.0.3.6)
actionview (= 6.0.3.4) actionview (= 6.0.3.6)
activejob (= 6.0.3.4) activejob (= 6.0.3.6)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (6.0.3.4) actionpack (6.0.3.6)
actionview (= 6.0.3.4) actionview (= 6.0.3.6)
activesupport (= 6.0.3.4) activesupport (= 6.0.3.6)
rack (~> 2.0, >= 2.0.8) rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.3.4) actiontext (6.0.3.6)
actionpack (= 6.0.3.4) actionpack (= 6.0.3.6)
activerecord (= 6.0.3.4) activerecord (= 6.0.3.6)
activestorage (= 6.0.3.4) activestorage (= 6.0.3.6)
activesupport (= 6.0.3.4) activesupport (= 6.0.3.6)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (6.0.3.4) actionview (6.0.3.6)
activesupport (= 6.0.3.4) activesupport (= 6.0.3.6)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.3.4) activejob (6.0.3.6)
activesupport (= 6.0.3.4) activesupport (= 6.0.3.6)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.0.3.4) activemodel (6.0.3.6)
activesupport (= 6.0.3.4) activesupport (= 6.0.3.6)
activerecord (6.0.3.4) activerecord (6.0.3.6)
activemodel (= 6.0.3.4) activemodel (= 6.0.3.6)
activesupport (= 6.0.3.4) activesupport (= 6.0.3.6)
activestorage (6.0.3.4) activestorage (6.0.3.6)
actionpack (= 6.0.3.4) actionpack (= 6.0.3.6)
activejob (= 6.0.3.4) activejob (= 6.0.3.6)
activerecord (= 6.0.3.4) activerecord (= 6.0.3.6)
marcel (~> 0.3.1) marcel (~> 1.0.0)
activesupport (6.0.3.4) activesupport (6.0.3.6)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
...@@ -205,7 +205,7 @@ GEM ...@@ -205,7 +205,7 @@ GEM
httparty (0.18.1) httparty (0.18.1)
mime-types (~> 3.0) mime-types (~> 3.0)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
i18n (1.8.8) i18n (1.8.9)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jbuilder (2.11.2) jbuilder (2.11.2)
activesupport (>= 5.0.0) activesupport (>= 5.0.0)
...@@ -222,18 +222,16 @@ GEM ...@@ -222,18 +222,16 @@ GEM
lumberjack (1.2.8) lumberjack (1.2.8)
mail (2.7.1) mail (2.7.1)
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
marcel (0.3.3) marcel (1.0.0)
mimemagic (~> 0.3.2)
method_source (1.0.0) method_source (1.0.0)
middleware (0.1.0) middleware (0.1.0)
mime-types (3.3.1) mime-types (3.3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2020.1104) mime-types-data (3.2020.1104)
mimemagic (0.3.5)
mini_magick (4.11.0) mini_magick (4.11.0)
mini_mime (1.0.2) mini_mime (1.0.3)
mini_portile2 (2.5.0) mini_portile2 (2.5.0)
minitest (5.14.3) minitest (5.14.4)
msgpack (1.4.2) msgpack (1.4.2)
multi_json (1.15.0) multi_json (1.15.0)
multi_test (0.1.2) multi_test (0.1.2)
...@@ -243,11 +241,11 @@ GEM ...@@ -243,11 +241,11 @@ GEM
net-ssh (>= 2.6.5, < 7.0.0) net-ssh (>= 2.6.5, < 7.0.0)
net-ssh (6.1.0) net-ssh (6.1.0)
netrc (0.11.0) netrc (0.11.0)
nio4r (2.5.4) nio4r (2.5.7)
nokogiri (1.11.1) nokogiri (1.11.2)
mini_portile2 (~> 2.5.0) mini_portile2 (~> 2.5.0)
racc (~> 1.4) racc (~> 1.4)
nokogiri (1.11.1-x64-mingw32) nokogiri (1.11.2-x64-mingw32)
racc (~> 1.4) racc (~> 1.4)
notiffany (0.1.3) notiffany (0.1.3)
nenv (~> 0.1) nenv (~> 0.1)
...@@ -274,29 +272,29 @@ GEM ...@@ -274,29 +272,29 @@ GEM
rack (>= 2.0.0) rack (>= 2.0.0)
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (6.0.3.4) rails (6.0.3.6)
actioncable (= 6.0.3.4) actioncable (= 6.0.3.6)
actionmailbox (= 6.0.3.4) actionmailbox (= 6.0.3.6)
actionmailer (= 6.0.3.4) actionmailer (= 6.0.3.6)
actionpack (= 6.0.3.4) actionpack (= 6.0.3.6)
actiontext (= 6.0.3.4) actiontext (= 6.0.3.6)
actionview (= 6.0.3.4) actionview (= 6.0.3.6)
activejob (= 6.0.3.4) activejob (= 6.0.3.6)
activemodel (= 6.0.3.4) activemodel (= 6.0.3.6)
activerecord (= 6.0.3.4) activerecord (= 6.0.3.6)
activestorage (= 6.0.3.4) activestorage (= 6.0.3.6)
activesupport (= 6.0.3.4) activesupport (= 6.0.3.6)
bundler (>= 1.3.0) bundler (>= 1.3.0)
railties (= 6.0.3.4) railties (= 6.0.3.6)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0) rails-html-sanitizer (1.3.0)
loofah (~> 2.3) loofah (~> 2.3)
railties (6.0.3.4) railties (6.0.3.6)
actionpack (= 6.0.3.4) actionpack (= 6.0.3.6)
activesupport (= 6.0.3.4) activesupport (= 6.0.3.6)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0) thor (>= 0.20.3, < 2.0)
...@@ -474,7 +472,7 @@ DEPENDENCIES ...@@ -474,7 +472,7 @@ DEPENDENCIES
oj oj
pg pg
rack-cors rack-cors
rails (~> 6.0) rails (~> 6.0.3.6)
rspec-json_expectations rspec-json_expectations
rspec-rails (~> 3.1) rspec-rails (~> 3.1)
rubocop rubocop
......
config/deploy.rb
# config valid only for current version of Capistrano # config valid only for current version of Capistrano
lock "3.11.1" lock "3.15.0"
set :application, "lumen-api" set :application, "lumen-api"
set :repo_url, "git@git.wattsworth.net:wattsworth/control-api.git" set :repo_url, "git@git.wattsworth.net:wattsworth/control-api.git"
......
config/deploy/production.rb
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# Defines a single server with a list of roles and multiple properties. # Defines a single server with a list of roles and multiple properties.
# You can define all roles on a single server, or split them: # You can define all roles on a single server, or split them:
server "beta.wattsworth.net", user: "rails", roles: %w{app db web}, port: 2222 server "cloud.wattsworth.net", user: "rails", roles: %w{app db web}, port: 22
# server "example.com", user: "deploy", roles: %w{app web}, other_property: :other_value # server "example.com", user: "deploy", roles: %w{app web}, other_property: :other_value
# server "db.example.com", user: "deploy", roles: %w{db} # server "db.example.com", user: "deploy", roles: %w{db}
...@@ -13,8 +13,11 @@ set :rbenv_prefix, "RBENV_ROOT=#{fetch(:rbenv_path)} RBENV_VERSION=#{fetch(:rben ...@@ -13,8 +13,11 @@ set :rbenv_prefix, "RBENV_ROOT=#{fetch(:rbenv_path)} RBENV_VERSION=#{fetch(:rben
set :rbenv_map_bins, %w{rake gem bundle ruby rails} set :rbenv_map_bins, %w{rake gem bundle ruby rails}
set :rbenv_roles, :all # default value set :rbenv_roles, :all # default value
append :linked_files, "db/production.sqlite3" append :linked_files, "config/database.yml", "config/initializers/smtp.rb",
set :deploy_to, "/opt/rails/lumen" "config/environments/production.rb", "config/secrets.yml"
#append :linked_files, "db/production.sqlite3"
set :deploy_to, "/opt/api_capistrano"
# role-based syntax # role-based syntax
# ================== # ==================
......
config/routes.rb
...@@ -30,7 +30,7 @@ Rails.application.routes.draw do ...@@ -30,7 +30,7 @@ Rails.application.routes.draw do
# fix for devise invitable from: # fix for devise invitable from:
#http://gabrielhilal.com/2015/11/07/integrating-devise_invitable-into-devise_token_auth/ #http://gabrielhilal.com/2015/11/07/integrating-devise_invitable-into-devise_token_auth/
mount_devise_token_auth_for 'User', at: 'auth', skip: [:invitations] mount_devise_token_auth_for 'User', at: 'auth', skip: [:invitations]
devise_for :users, path: "auth", only: [:invitations], devise_for :users, defaults: {format: :json}, path: "auth", only: [:invitations],
controllers: { invitations: 'invitations' } controllers: { invitations: 'invitations' }
resources :users, only: [:index] do resources :users, only: [:index] do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment