mirror of
https://github.com/internetee/registry.git
synced 2025-07-02 17:23:34 +02:00
Merge branch 'registry-508' into update-nokogiri-gem
This commit is contained in:
commit
0ef06fbdb8
7 changed files with 3 additions and 30 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -11,7 +11,6 @@ capybara-*.html
|
|||
**.orig
|
||||
config/initializers/secret_token.rb
|
||||
config/deploy.rb
|
||||
config/secrets.yml
|
||||
config/database.yml
|
||||
config/application.yml
|
||||
config/environments/development.rb
|
||||
|
|
|
@ -7,7 +7,6 @@ before_script:
|
|||
- "psql -c 'create database registry_whois_test;' -U postgres"
|
||||
- "psql -c 'create database registry_api_log_test;' -U postgres"
|
||||
- "cp config/application-example.yml config/application.yml"
|
||||
- "cp config/secrets-example.yml config/secrets.yml"
|
||||
- "cp config/database-travis.yml config/database.yml"
|
||||
- "RAILS_ENV=test bundle exec rake db:setup:all"
|
||||
script:
|
||||
|
|
|
@ -61,18 +61,8 @@ module Soap
|
|||
|
||||
def initialize
|
||||
if self.class.username.nil?
|
||||
if Rails.application.secrets.key?(:arireg)
|
||||
arireg = Rails.application.secrets[:arireg].with_indifferent_access
|
||||
self.class.username = arireg[:username]
|
||||
self.class.password = arireg[:password]
|
||||
if self.class.wsdl.nil? # no override of config/environments/* ?
|
||||
self.class.wsdl = arireg[:wsdl]
|
||||
self.class.host = arireg[:host]
|
||||
end
|
||||
else
|
||||
self.class.username = ENV['arireg_username']
|
||||
self.class.password = ENV['arireg_password']
|
||||
end
|
||||
self.class.username = ENV['arireg_username']
|
||||
self.class.password = ENV['arireg_password']
|
||||
end
|
||||
if self.class.wsdl.nil?
|
||||
self.class.wsdl = ENV['arireg_wsdl']
|
||||
|
|
|
@ -92,7 +92,6 @@ restful_whois_url: 'https://restful-whois.example.com'
|
|||
#
|
||||
# Estonian Business Registry
|
||||
#
|
||||
# config/secrets.yml --- arireg: {username, password}
|
||||
arireg_username: 'kasutaja'
|
||||
arireg_password: 'parool'
|
||||
# config/environments/production.rb --- Soap::Arireg.wsdl, Soap::Arireg.host
|
||||
|
|
|
@ -80,6 +80,7 @@ module Registry
|
|||
}
|
||||
|
||||
config.action_view.default_form_builder = 'DefaultFormBuilder'
|
||||
config.secret_key_base = Figaro.env.secret_key_base
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
Registry::Application.config.secret_token = ENV['secret_key_base']
|
|
@ -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
|
Loading…
Add table
Add a link
Reference in a new issue