zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-27 04:58:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'registry-516' into registry-480

Browse source
This commit is contained in:
Artur Beljajev 2017-05-22 23:20:43 +03:00
commit 466d864270
4 changed files with 1 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -7,7 +7,6 @@ before_script:
- "psql -c 'create database registry_whois_test;' -U postgres" - "psql -c 'create database registry_whois_test;' -U postgres"
- "psql -c 'create database registry_api_log_test;' -U postgres" - "psql -c 'create database registry_api_log_test;' -U postgres"
- "cp config/application-example.yml config/application.yml" - "cp config/application-example.yml config/application.yml"
- "cp config/secrets-example.yml config/secrets.yml"
- "cp config/database-travis.yml config/database.yml" - "cp config/database-travis.yml config/database.yml"
- "RAILS_ENV=test bundle exec rake db:setup:all" - "RAILS_ENV=test bundle exec rake db:setup:all"
script: script:

1
config/application.rb
View file

@ -80,6 +80,7 @@ module Registry
} }
config.action_view.default_form_builder = 'DefaultFormBuilder' config.action_view.default_form_builder = 'DefaultFormBuilder'
config.secret_key_base = Figaro.env.secret_key_base
end end
end end

1
config/initializers/set_secret.rb
View file

@ -1 +0,0 @@
Registry::Application.config.secret_token = ENV['secret_key_base']

14
config/secrets-example.yml
View file

@ -1,14 +0,0 @@
development:
secret_key_base: generate-your-secret-key-by-rake-secret
test:
secret_key_base: generate-your-secret-key-by-rake-secret
alpha:
secret_key_base: generate-your-secret-key-by-rake-secret
staging:
secret_key_base: generate-your-secret-key-by-rake-secret
production:
secret_key_base: generate-your-secret-key-by-rake-secret