Merge branch 'master' into rspec

.rubocop.yml

@@ -15,9 +15,10 @@ AllCops:
     - 'spec/support/epp.rb'
     - 'spec/support/epp_contact_xml_builder.rb'
     - 'vendor/bundle/**/*'
+    - 'lib/tasks/import.rake'
 
 Metrics/LineLength:
-  Max: 120
+  Max: 120 # default 80
 
 Metrics/MethodLength:
   Max: 25 # default 10

.travis.yml

@@ -21,7 +21,6 @@ services:
 addons:
   postgresql: "9.4"
   code_climate:
-      repo_token: 2fd0ab95eab718206f6732fdbd7b650da1e228f8dd491ef2082bb59d8684a054
 branches:
   only:
     - master

README.md

@@ -464,8 +464,3 @@ Please follow WHOIS server readme:
 
     https://github.com/internetee/whois
 
-
-## Code Status
-
-Alpha release status, only model tests:
-[![Build Status](https://travis-ci.org/domify/registry.svg?branch=master)](https://travis-ci.org/domify/registry)

app/validators/domain_name_validator.rb

@@ -18,7 +18,6 @@ class DomainNameValidator < ActiveModel::EachValidator
       return true if origins.include?(value)
 
       general_domains = /(#{origins.join('|')})/
-      # general_domains = /(.pri.ee|.com.ee|.fie.ee|.med.ee|.ee)/
 
       # it's punycode
       if value[2] == '-' && value[3] == '-'
@@ -39,7 +38,7 @@ class DomainNameValidator < ActiveModel::EachValidator
     def validate_blocked(value)
       return true unless value
       return false if BlockedDomain.where(name: value).count > 0
-      ZonefileSetting.where(origin: value).count == 0
+      ZonefileSetting.where(origin: value).count.zero?
     end
   end
 end

config/application-example.yml

@@ -41,6 +41,7 @@ time_zone: 'Tallinn' # more zones by rake time:zones:all
 
 openssl_config_path: '/etc/ssl/openssl.cnf'
 crl_dir:     '/home/registry/registry/shared/ca/crl'
+crl_path:     '/home/registry/registry/shared/ca/crl/crl.pem'
 ca_cert_path: '/home/registry/registry/shared/ca/certs/ca.crt.pem'
 ca_key_path:  '/home/registry/registry/shared/ca/private/ca.key.pem'
 ca_key_password: 'your-root-key-password'

doc/certificates.md

@@ -90,6 +90,7 @@ Create certificate revocation list (prompts for pass phrase):
 Configure registry registry/shared/config/application.yml to match the CA settings:
     
     openssl_config_path: '/etc/ssl/openssl.cnf'
+    crl_dir:     '/home/registry/registry/shared/ca/crl/'
     crl_path:     '/home/registry/registry/shared/ca/crl/crl.pem'
     ca_cert_path: '/home/registry/registry/shared/ca/certs/ca.crt.pem'
     ca_key_path:  '/home/registry/registry/shared/ca/private/ca.key.pem'
@@ -100,7 +101,7 @@ Configure registry registry/shared/config/application.yml to match the CA settin
 
 Configure registry epp registry-epp/shared/config/application.yml:
 
-    webclient_ips: '54.154.91.240'
+    webclient_ips: '127.0.0.1' # IP where webclient is running
 
 Configure EPP port 700 virtual host:
 

spec/rails_helper.rb

@@ -8,12 +8,6 @@ require 'money-rails/test_helpers'
 require 'support/requests/session_helpers'
 require 'support/requests/epp_helpers'
 require 'support/features/session_helpers'
-
-if ENV['ROBOT']
-  require 'simplecov'
-  SimpleCov.start 'rails'
-end
-
 require 'support/matchers/alias_attribute'
 require 'support/matchers/active_job'
 require 'support/matchers/epp/code'

spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'webmock/rspec'
-require 'simplecov'
-SimpleCov.start
+if ENV['TRAVIS']
+  require 'simplecov'
+  SimpleCov.start
+end
 
 
 RSpec.configure do |config|