letsencrypt_standalone 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a34ce84d9d02c67824c9e89d2697ec3ea0f84500
-  data.tar.gz: da79874d967783d1a660e1907600142aeddf379c
+  metadata.gz: a1dc96b4eddbd583b7141881bf3aec8b2fbd2c5c
+  data.tar.gz: 79e7a69e16ed018ea89d5bbd1f7f7d982397a201
 SHA512:
-  metadata.gz: b24861c717cce83fa553e5328418bcbbcd4f850ec912018e226dd2a3b15d501975c6c6f57218dde112e0d9409e457d1cebc02ad339abcc79d5bdb3053b6501dc
-  data.tar.gz: abad761a0596aa684d4166cca97d1adeffeb7e22c9c0ca9b07ad4f57ac41c9e84a439f286e053194122a0981f40a0362b762292050da9807bbcaf23aaddfd7b7
+  metadata.gz: 0148cb5a4d77bebd9223279ff9c72d7bf93521a9140b7603abfb19f646807a2b691b9a0a6ba4e87a83e401329e168c81decdd29cda62d76944b56c313789e6a0
+  data.tar.gz: 3fc433da6910407d43a4c74d87dcedce87b0cb76fbef33440a5cde563aeccd93d850beb02c66b9fe45cc55b808de1334e9d5c18c0ff2f30c43c76d16ffc73428

data/exe/le_standalone

@@ -71,7 +71,7 @@ begin
   config.domains.each do |params|
     domain = LetsencryptStandalone::Domain.new(params: params)
     config.push_private_key_name(domain: domain)
-
+	binding.pry if domain[:host] == "www.planetpass.io"
     if domain.certificates
       certificate = LetsencryptStandalone::Certificate.new(client: client.acme_client, domain: domain)
       next if !certificate.needs_refresh?
@@ -87,7 +87,7 @@ begin
         status = domain.verify_status
         if status == 'valid'
           logger.info "Verified #{domain.host} challenge. Obtaining certificate."
-          certificate ||= LetsencryptStandalone::Certificate.new(client: client.acme_client, domain: domain)
+          certificate = LetsencryptStandalone::Certificate.new(client: client.acme_client, domain: domain)
                             .obtain_new
 
           certificate.save

data/lib/letsencrypt_standalone/certificate.rb

@@ -15,10 +15,11 @@ module LetsencryptStandalone
     attr_reader :files
 
     def initialize(domain:, client:)
-      @files       = domain.certificates || @@default_names
-      @domain      = domain.host
-      @client      = client
-      @private_key = domain.private_key
+      @certificate  = domain.certificates[:certificate]
+	  @files        = domain.files || @@default_names
+      @domain       = domain.host
+      @client       = client
+      @private_key  = domain.private_key
     end
 
     def obtain_new
@@ -28,8 +29,7 @@ module LetsencryptStandalone
     end
 
     def needs_refresh?
-      cert = @files[:certificate]
-      if cert.not_after > Time.now + 2*24*3600
+      if @certificate.not_after > Time.now + 2*24*3600
         logger.info("It doesnt need to refresh cert for domain: #{@domain}")
         false
       else

data/lib/letsencrypt_standalone/domain.rb

@@ -4,7 +4,7 @@ require 'fileutils'
 
 module LetsencryptStandalone
   class Domain < Base
-    attr_accessor :host, :private_key, :certificates
+    attr_accessor :host, :private_key, :certificates, :files
     attr_reader :private_key_name, :private_key_path
 
     @@default_private_key_name = 'private_key.pem'
@@ -13,9 +13,9 @@ module LetsencryptStandalone
       @host = params.fetch(:host)
       @private_key_name = params.fetch(:private_key, @@default_private_key_name)
       @private_key_path = File.join(output_dir,@host, @private_key_name)
-
+	  @files = params[:certificates]
       if params.has_key? :certificates
-        load_certs(params)
+        load_certs
       end
       load_private_key
     end
@@ -68,9 +68,9 @@ module LetsencryptStandalone
       File.new(@private_key_path, 'w').write(@private_key.to_pem)
     end
 
-    def load_certs(params)
+    def load_certs
       @certificates = {}
-      params[:certificates].each do |type, file|
+      files.each do |type, file|
         cert = OpenSSL::X509::Certificate.new(File.read(File.join(host_dir, file)))
         @certificates[type] = cert
         logger.info "Trying to use existing cert #{type} for #{@host}"

data/lib/letsencrypt_standalone/version.rb

@@ -1,3 +1,3 @@
 module LetsencryptStandalone
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: letsencrypt_standalone
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Grigory Aksentyev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler