From b3676761b460047825c7f2ba55fa069ac8895ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B1=E5=8D=9A=E4=BA=9E?= Date: Sat, 20 May 2023 10:41:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=BE=A9=E9=8C=AF=E8=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/site_construct.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/site_construct.rb b/app/models/site_construct.rb index 4744e56..f46cb8b 100644 --- a/app/models/site_construct.rb +++ b/app/models/site_construct.rb @@ -142,10 +142,10 @@ class SiteConstruct if old_server_block.present? new_server_block = old_server_block.gsub('\n',"\n").gsub(/(listen\s+)[^;]+/){|ff| "#{$1}#{port_text}"} if port_text == "80" - new_server_block = new_server_block.gsub(/^.*#\s*managed by Certbot(\n|$)/,'') + new_server_block = new_server_block.gsub(/[ \t]*#\s*managed by Certbot/,'') else if self.site_cert && !(self.site_cert.is_certbot) - new_server_block = new_server_block.gsub(/#\s*managed by Certbot/,'') + new_server_block = new_server_block.gsub(/[ \t]*#\s*managed by Certbot/,'') end end new_server_block = new_server_block.gsub(/(server_name\s+)[^;]+/m){|ff| "#{$1}#{domain_name_str}"}