From db8016d43609e6aebff8f4bcfa244b82baa1be5d Mon Sep 17 00:00:00 2001 From: Bohung Date: Mon, 26 Apr 2021 09:54:52 +0800 Subject: [PATCH] Fix bug. --- app/models/site_construct.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/site_construct.rb b/app/models/site_construct.rb index 96461d0..bc48653 100644 --- a/app/models/site_construct.rb +++ b/app/models/site_construct.rb @@ -116,15 +116,15 @@ class SiteConstruct domain_name = self.domain_name new_server_block = new_server_block.gsub(/(server_name\s+)[^;]+/m){|ff| "#{$1}#{domain_name}"} new_server_block = new_server_block.gsub(/\s*ssl_certificate[^;]+;/,'') + get_redirect_block = parse_nginx_text_to_server_blocks(old_server_block,true,2).select{|t| t.match(/\s*return\s+30[12]\s+https:\/\/\$host\$request_uri\s*;/)} + if get_redirect_block.count > 0 + get_redirect_block.each do |redirect_block| + new_server_block = new_server_block.gsub(redirect_block,'') + end + end if port == "443" new_server_block = new_server_block.gsub(/(listen\s+)[^;]+;/){|ff| ff + "\n\n ssl_certificate #{self.cert_file_remote_store_path};\n\n ssl_certificate_key #{self.private_key_remote_store_path};\n\n"} else - get_redirect_block = parse_nginx_text_to_server_blocks(old_server_block,true,2).select{|t| t.match(/\s*return\s+30[12]\s+https:\/\/\$host\$request_uri\s*;/)} - if get_redirect_block.count > 0 - get_redirect_block.each do |redirect_block| - new_server_block = new_server_block.gsub(redirect_block,'') - end - end if self.redirect_to_https && !self.site_cert.nil? new_server_block = new_server_block.sub(/(listen\s+)[^;]+;[\s\r\n]*/){|ff| ff + " if ($host ~ (#{self.site_cert.domain_names.map{|s| '^'+s.gsub('.','\.').gsub('*','[^.]*').gsub(',','')}.join('|')}) ) {\n"+ " return 301 https://$host$request_uri;\n"+