Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Updating Cap 3.5 config
  • Loading branch information
awead committed May 3, 2016
1 parent 934a903 commit d8fa47f
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 21 deletions.
5 changes: 0 additions & 5 deletions .gitignore
Expand Up @@ -5,15 +5,10 @@ config/fedora3.yml
config/hydra-ldap.yml
config/newrelic.yml
config/browse_everything_providers.yml
config/secrets.yml
config/analytics.yml
config/arkivo.yml
config/share_notify.yml

# This file is generated automatically by: rake scholarsphere:generate_secret
config/initializers/secret_token.rb
config/initializers/sufia-secret.rb

## MAC OS
.DS_Store
.idea/*
Expand Down
3 changes: 0 additions & 3 deletions Capfile
Expand Up @@ -23,9 +23,6 @@ require 'capistrano/git' #git
require './lib/capistrano/submodule_strategy' #custom submodule strategy
require 'capistrano/rbenv_install' #rbenv install plugin

# Makes Capistrano's output nicer to look at
require 'airbrussh/capistrano'

# Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
# tasks included: passenger, checksum
Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Expand Up @@ -46,7 +46,6 @@ group :development, :test do
end

group :development do
gem 'airbrussh', require: false
gem 'better_errors'
gem 'binding_of_caller'
gem 'capistrano', '~> 3.0', require: false
Expand Down
1 change: 0 additions & 1 deletion Gemfile.lock
Expand Up @@ -785,7 +785,6 @@ PLATFORMS
ruby

DEPENDENCIES
airbrussh
better_errors
binding_of_caller
browse-everything (~> 0.10)
Expand Down
15 changes: 9 additions & 6 deletions config/deploy.rb
@@ -1,6 +1,5 @@
# frozen_string_literal: true
# config valid only for Capistrano 3.4
lock '3.4.0'
lock '3.5.0'

# application and repo settings
set :application, 'scholarsphere'
Expand Down Expand Up @@ -39,6 +38,9 @@
set :log_level, :debug
set :pty, true

# Airbrussh options
set :format_options, command_output: false

# Default value for :linked_files is []
set :linked_files, fetch(:linked_files, []).push(
'config/database.yml',
Expand All @@ -56,10 +58,9 @@
'config/browse_everything_providers.yml',
'config/arkivo.yml',
'config/zotero.yml',
'config/secrets.yml',
'public/sitemap.xml',
'public/robots.txt',
'config/initializers/secret_token.rb',
'config/initializers/sufia-secret.rb',
'config/initializers/arkivo_constraint.rb'
)

Expand Down Expand Up @@ -102,7 +103,8 @@
end
end
end
after :migrate, :resolrize
# Disable resolrization until after PCDM migration
# after :migrate, :resolrize

desc "Restart resque-pool"
task :resquepoolrestart do
Expand All @@ -122,7 +124,8 @@
end
end
end
after :published, :sitemapxml
# Disabled, see psu-stewardship/scholarsphere#285
# after :published, :sitemapxml

# Passenger Capistrano Task
# The passenger install task allows Chef to install Passenger now via Yum, but it allows Capistrano to maintain the file
Expand Down
8 changes: 8 additions & 0 deletions config/secrets.yml
@@ -0,0 +1,8 @@
development:
secret_key_base: 526be16505c6162a8425fd720dd26afe2d3cc1832298121e1575e0c177f9e70e52cc2596d055ecae1a444d5496de43dfd505e94a5d487917ac1fa7beed6d35fa

test:
secret_key_base: 252e3ea0c4d45141ba31c54b8b5e62a2f7207d1d1187b7d63e863e572547d55959526becc574c1b852a4784e8887c69072adae641855eb9eb9a4a2384e547e8c

production:
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
5 changes: 0 additions & 5 deletions config/secrets.yml.sample

This file was deleted.

0 comments on commit d8fa47f

Please sign in to comment.