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

Merge branch 'master' of github.com:neocities/neocities

Browse source
This commit is contained in:
Kyle Drake 2016-07-11 16:27:54 -07:00
commit 83ee577a14
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/settings.rb
View file

@ -225,6 +225,7 @@ post '/settings/:username/custom_domain' do
require_login require_login
require_ownership_for_settings require_ownership_for_settings
original_domain = @site.domain
@site.domain = params[:domain] @site.domain = params[:domain]
begin begin
@ -243,7 +244,11 @@ post '/settings/:username/custom_domain' do
if @site.valid? if @site.valid?
@site.save_changes @site.save_changes
if @site.domain != original_domain
LetsEncryptWorker.perform_async @site.id LetsEncryptWorker.perform_async @site.id
end
flash[:success] = 'The domain has been successfully updated.' flash[:success] = 'The domain has been successfully updated.'
redirect "/settings/#{@site.username}#custom_domain" redirect "/settings/#{@site.username}#custom_domain"
else else

2
workers/lets_encrypt_worker.rb
View file

@ -11,7 +11,7 @@ class LetsEncryptWorker
end end
# If you need to clear scheduled jobs: # If you need to clear scheduled jobs:
# Sidekiq::ScheduledSet.new.select {|s| JSON.parse(s.value)['class'] == 'LetsEncryptWorker'}.length # Sidekiq::ScheduledSet.new.select {|s| JSON.parse(s.value)['class'] == 'LetsEncryptWorker'}.each {|j| j.delete}
def letsencrypt def letsencrypt
Acme::Client.new( Acme::Client.new(