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

deduping code and fixes for letsencrypt

Browse source
This commit is contained in:
Kyle Drake 2016-06-18 21:25:41 +00:00
parent 06b74f3e8e
commit 1fc3120363
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
public/banned_sites/.gitignore vendored
View file

14
workers/lets_encrypt_worker.rb
View file

@ -9,6 +9,16 @@ class LetsEncryptWorker
end end
def perform(site_id) def perform(site_id)
# Dispose of dupes
queue = Sidekiq::Queue.new self.class.sidekiq_options_hash['queue']
queue.each do |job|
if job.args == [site_id] && job.jid != jid
job.delete
end
end
letsencrypt = Acme::Client.new( letsencrypt = Acme::Client.new(
private_key: OpenSSL::PKey::RSA.new(File.read($config['letsencrypt_key'])), private_key: OpenSSL::PKey::RSA.new(File.read($config['letsencrypt_key'])),
endpoint: $config['letsencrypt_endpoint'] endpoint: $config['letsencrypt_endpoint']
@ -32,8 +42,8 @@ class LetsEncryptWorker
attempts = 0 attempts = 0
begin begin
raise VerificationTimeoutError if attempts == 5 raise VerificationTimeoutError if attempts == 30
raise NotAuthorizedYet if challenge.verify_status != 'valid' raise NotAuthorizedYetError if challenge.verify_status != 'valid'
rescue NotAuthorizedYet rescue NotAuthorizedYet
sleep 5 sleep 5
attempts += 1 attempts += 1