From 40246bf081b28f5337d36d20beb2f25ed7a77693 Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Mon, 10 Apr 2017 23:47:33 +0300 Subject: [PATCH 1/7] start simplecov only with travis --- .travis.yml | 1 - spec/rails_helper.rb | 6 ------ spec/spec_helper.rb | 6 ++++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index b49edd8e2..f5fd67bc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,6 @@ services: addons: postgresql: "9.4" code_climate: - repo_token: 2fd0ab95eab718206f6732fdbd7b650da1e228f8dd491ef2082bb59d8684a054 branches: only: - master diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 110e8df27..b4a4443ee 100644 --- a/spec/rails_helper.rb +++ b/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' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 0f9fd4e8d..664043716 100644 --- a/spec/spec_helper.rb +++ b/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| From c5081a1e6b87cc055dd68266d85092dbe2c1dc36 Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Tue, 11 Apr 2017 00:39:34 +0300 Subject: [PATCH 2/7] follow rubocop standards in domain_name_validator, remove unused line --- app/validators/domain_name_validator.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/validators/domain_name_validator.rb b/app/validators/domain_name_validator.rb index 427a330f3..be8cbb65f 100644 --- a/app/validators/domain_name_validator.rb +++ b/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 From 5f03443922cfb28463697f2e326bb009f7aee358 Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Tue, 11 Apr 2017 01:01:08 +0300 Subject: [PATCH 3/7] update readme, ignore import rake task in rubocop --- .rubocop.yml | 3 ++- README.md | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 0857a9120..d9e50b9a2 100644 --- a/.rubocop.yml +++ b/.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 diff --git a/README.md b/README.md index 9b2833fa2..49a27815b 100644 --- a/README.md +++ b/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) From 2c986782f0b1853804f584ed29436fab8eae841c Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Tue, 11 Apr 2017 01:07:04 +0300 Subject: [PATCH 4/7] fix #263 --- doc/certificates.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/certificates.md b/doc/certificates.md index 4caea4988..a77edbc2f 100644 --- a/doc/certificates.md +++ b/doc/certificates.md @@ -90,7 +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_path: '/home/registry/registry/shared/ca/crl/crl.pem' + crl_dir: '/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' From 84d4b39b8f3c709ca80facaee7627c4ca3d803c7 Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Tue, 11 Apr 2017 01:32:09 +0300 Subject: [PATCH 5/7] bring back crl_path --- doc/certificates.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/certificates.md b/doc/certificates.md index a77edbc2f..2088bb011 100644 --- a/doc/certificates.md +++ b/doc/certificates.md @@ -90,7 +90,8 @@ 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.pem' + 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' From 85ef41b347432df5ce4b2119c48623f73092e755 Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Tue, 11 Apr 2017 01:34:30 +0300 Subject: [PATCH 6/7] remove random amazon ip --- doc/certificates.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/certificates.md b/doc/certificates.md index 2088bb011..bcb28a039 100644 --- a/doc/certificates.md +++ b/doc/certificates.md @@ -101,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: From bbabaf75f6f1be21bfdeb36d7a95bcc6d84cf972 Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Tue, 11 Apr 2017 01:40:52 +0300 Subject: [PATCH 7/7] add crl_path to application-example.yml #263 --- config/application-example.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/application-example.yml b/config/application-example.yml index 6ef70c9a0..20b9370e1 100644 --- a/config/application-example.yml +++ b/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'