From 10dcfac1f17cffbbc542d47bdf27b682ab453dd2 Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Thu, 6 Jun 2019 13:57:50 +0000 Subject: Revert "Merge branch 'pages-domain_ssl-valid-period' into 'master'" This reverts merge request !28743 --- app/models/pages_domain.rb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'app') diff --git a/app/models/pages_domain.rb b/app/models/pages_domain.rb index 8313d33f101..407d85b1520 100644 --- a/app/models/pages_domain.rb +++ b/app/models/pages_domain.rb @@ -134,14 +134,6 @@ class PagesDomain < ApplicationRecord "#{VERIFICATION_KEY}=#{verification_code}" end - def certificate=(certificate) - super(certificate) - - # set nil, if certificate is nil - self.certificate_valid_not_before = x509&.not_before - self.certificate_valid_not_after = x509&.not_after - end - private def set_verification_code @@ -194,7 +186,7 @@ class PagesDomain < ApplicationRecord end def x509 - return unless certificate.present? + return unless certificate @x509 ||= OpenSSL::X509::Certificate.new(certificate) rescue OpenSSL::X509::CertificateError -- cgit v1.2.1