mirror of
https://github.com/neocities/neocities.git
synced 2025-04-25 01:32:36 +02:00
fix up acme challenge turd cleanup
This commit is contained in:
parent
dccd03a941
commit
b495761db4
1 changed files with 11 additions and 3 deletions
|
@ -190,11 +190,19 @@ class LetsEncryptWorker
|
||||||
wellknown_path = File.join site.base_files_path, '.well-known'
|
wellknown_path = File.join site.base_files_path, '.well-known'
|
||||||
acme_challenge_path = File.join wellknown_path, 'acme-challenge'
|
acme_challenge_path = File.join wellknown_path, 'acme-challenge'
|
||||||
|
|
||||||
if File.exist?(acme_challenge_path)
|
site.site_files_dataset.where(Sequel.like(:path, '.well-known/acme-challenge%')).each do |s|
|
||||||
FileUtils.rm acme_challenge_path
|
s.destroy
|
||||||
site.site_files_dataset.where(path: '.well-known/acme-challenge').destroy
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Dir.glob(File.join(acme_challenge_path, '*')).each do |f|
|
||||||
|
FileUtils.rm f
|
||||||
|
end
|
||||||
|
|
||||||
|
if Dir.exist?(acme_challenge_path)
|
||||||
|
Dir.rmdir acme_challenge_path
|
||||||
|
end
|
||||||
|
|
||||||
|
# .well-known was not created by user, removing to prevent confusion
|
||||||
if site.site_files_dataset.where(path: '.well-known').count == 0
|
if site.site_files_dataset.where(path: '.well-known').count == 0
|
||||||
begin
|
begin
|
||||||
Dir.rmdir wellknown_path
|
Dir.rmdir wellknown_path
|
||||||
|
|
Loading…
Add table
Reference in a new issue