From 0adc6d65fd7723120a2eb999f56f49da4b21c713 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Thu, 29 Jun 2017 11:12:39 -0700 Subject: [PATCH] Fixes for not saving keys/certs when refreshed --- models/site.rb | 11 ----------- workers/lets_encrypt_worker.rb | 1 + 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/models/site.rb b/models/site.rb index a122d9ce..52080593 100644 --- a/models/site.rb +++ b/models/site.rb @@ -827,7 +827,6 @@ class Site < Sequel::Model end def after_save - store_ssl_in_redis_proxy if @_ssl_changed save_tags super end @@ -1384,16 +1383,6 @@ class Site < Sequel::Model domain && ssl_key && ssl_cert end - def ssl_key=(val) - @_ssl_changed = true - values[:ssl_key] = val - end - - def ssl_cert=(val) - @_ssl_changed = true - values[:ssl_cert] = val - end - def store_ssl_in_redis_proxy return false unless ssl_installed? $redis_proxy.hset "ssl-#{domain}", 'crt', OpenSSL::X509::Certificate.new(ssl_cert).to_der diff --git a/workers/lets_encrypt_worker.rb b/workers/lets_encrypt_worker.rb index a72ff20b..b11b009e 100644 --- a/workers/lets_encrypt_worker.rb +++ b/workers/lets_encrypt_worker.rb @@ -190,6 +190,7 @@ class LetsEncryptWorker site.cert_updated_at = Time.now site.domain_fail_count = 0 site.save_changes validate: false + site.store_ssl_in_redis_proxy # Refresh the cert periodically, current expire time is 90 days # We're going for a cron task for this now, so this is commented out.