rails-letsencrypt 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cd16f726ca1f16ff33db2bdde9c5d3e13310ac875d475f209761c3e7e5115bf
-  data.tar.gz: 7868c273d7d2058e08b02e6b1561c9222c7132c9cc8c8a604404bee90ec95b5c
+  metadata.gz: c66c89051c25749cc81ea2c424a44906bb6dc7919a8dcf1f1232545cae89ccd2
+  data.tar.gz: 15e4fd11a59a9785cc1f082a9892eb8d6f55da8d7eaac7e7031bc56c4b6fb1c0
 SHA512:
-  metadata.gz: f8b31a39a0eaa18e1aaca42db86e225560db6d6275ab9d11ca128180175bae0bc4c13bacd7f134eb81e2fe7544d4478cbd6447f18706f953ee0d790f33d5542e
-  data.tar.gz: d31bfb345ccf6d730a9b0f355be6885feb3e7ff24d55dfdf5fbc530bbe1583489496fd23d3dfd4bcce5ea190539fb6d194347171a8b26a916090323f114c3dd2
+  metadata.gz: 95fc3af7a3f89e95e4b50ed67ae0c1ed0ec21e3f1dd8c8a8563d5154f38acb23e6350d622bfc5104f89ac4274b8b0da84da9a34db49420eaf860d38d5e4ee9cb
+  data.tar.gz: 5743cc2eefdd22bcd211651add527f0f0e6df56f0fe085cb8da6e5cdae071b16e372f9a8e7a72f4a8e51615fd08894b00be3db493e663806132b5695f114d0e0

data/app/models/lets_encrypt/certificate.rb

@@ -34,6 +34,7 @@ module LetsEncrypt
 
     before_create -> { self.key = OpenSSL::PKey::RSA.new(4096).to_s }
     after_save -> { save_to_redis }, if: -> { LetsEncrypt.config.use_redis? && active? }
+    after_destroy -> { delete_from_redis }, if: -> { LetsEncrypt.config.use_redis? && active? }
 
     # Returns false if certificate is not issued.
     #
@@ -57,7 +58,7 @@ module LetsEncrypt
 
     # Returns full-chain bundled certificates
     def bundle
-      certificate + intermediaries
+      (certificate || '') + (intermediaries || '')
     end
 
     def certificate_object
@@ -73,6 +74,11 @@ module LetsEncrypt
       LetsEncrypt::Redis.save(self)
     end
 
+    # Delete certificate from redis
+    def delete_from_redis
+      LetsEncrypt::Redis.delete(self)
+    end
+
     protected
 
     def logger

data/lib/letsencrypt/redis.rb

@@ -10,10 +10,18 @@ module LetsEncrypt
 
       # Save certificate into redis.
       def save(cert)
-        return unless cert.key.present? && cert.certificate.present?
-        LetsEncrypt.logger.info "Save #{cert.domain}'s certificate to redis"
+        return unless cert.key.present? && cert.bundle.present?
+        LetsEncrypt.logger.info "Save #{cert.domain}'s certificate (bundle) to redis"
         connection.set "#{cert.domain}.key", cert.key
-        connection.set "#{cert.domain}.crt", cert.certificate
+        connection.set "#{cert.domain}.crt", cert.bundle
+      end
+
+      # Delete certificate from redis.
+      def delete(cert)
+        return unless cert.key.present? && cert.certificate.present?
+        LetsEncrypt.logger.info "Delete #{cert.domain}'s certificate from redis"
+        connection.del "#{cert.domain}.key"
+        connection.del "#{cert.domain}.crt"
       end
     end
   end

data/lib/letsencrypt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LetsEncrypt
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/lib/tasks/letsencrypt_tasks.rake

@@ -1,17 +1,20 @@
 # frozen_string_literal: true
 
 namespace :letsencrypt do
-  desc 'Renew the certificates will epxired'
+  desc "Renew certificates that already expired or expiring soon"
   task renew: :environment do
     count = 0
     failed = 0
+
     LetsEncrypt.certificate_model.renewable.each do |certificate|
       count += 1
+
       next if certificate.renew
+
       failed += 1
-      log "Could not renew domain: #{certificate.domain}"
+      puts "Could not renew domain: #{certificate.domain}"
     end
 
-    puts "Total #{count} domains should renew, and #{failed} domains cannot be renewed."
+    puts "Renewed #{count - failed} out of #{count} domains"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-letsencrypt
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - 蒼時弦也
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails