zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 01:32:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixes for not saving keys/certs when refreshed

Browse source
This commit is contained in:
Kyle Drake 2017-06-29 11:12:39 -07:00
parent 8d5a1c0561
commit 0adc6d65fd
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
models/site.rb
View file

@ -827,7 +827,6 @@ class Site < Sequel::Model
end end
def after_save def after_save
store_ssl_in_redis_proxy if @_ssl_changed
save_tags save_tags
super super
end end
@ -1384,16 +1383,6 @@ class Site < Sequel::Model
domain && ssl_key && ssl_cert domain && ssl_key && ssl_cert
end 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 def store_ssl_in_redis_proxy
return false unless ssl_installed? return false unless ssl_installed?
$redis_proxy.hset "ssl-#{domain}", 'crt', OpenSSL::X509::Certificate.new(ssl_cert).to_der $redis_proxy.hset "ssl-#{domain}", 'crt', OpenSSL::X509::Certificate.new(ssl_cert).to_der

1
workers/lets_encrypt_worker.rb
View file

@ -190,6 +190,7 @@ class LetsEncryptWorker
site.cert_updated_at = Time.now site.cert_updated_at = Time.now
site.domain_fail_count = 0 site.domain_fail_count = 0
site.save_changes validate: false site.save_changes validate: false
site.store_ssl_in_redis_proxy
# Refresh the cert periodically, current expire time is 90 days # 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. # We're going for a cron task for this now, so this is commented out.