diff --git a/.gitignore b/.gitignore index 733375212..be64af3ba 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/app/models/soap/arireg.rb b/app/models/soap/arireg.rb index 422a72dd9..98810eeda 100644 --- a/app/models/soap/arireg.rb +++ b/app/models/soap/arireg.rb @@ -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'] diff --git a/config/application-example.yml b/config/application-example.yml index 20b9370e1..9d68e44e8 100644 --- a/config/application-example.yml +++ b/config/application-example.yml @@ -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