From c4dcacb3eea34a69da658ff5422567ad663b4d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B1=E5=8D=9A=E4=BA=9E?= Date: Sat, 6 Mar 2021 18:48:14 +0800 Subject: [PATCH] fix error --- lib/tasks/add_cert_ver_for_site.rake | 4 ++-- lib/tasks/change_site_server_name.rake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tasks/add_cert_ver_for_site.rake b/lib/tasks/add_cert_ver_for_site.rake index c46a2d5..4463364 100644 --- a/lib/tasks/add_cert_ver_for_site.rake +++ b/lib/tasks/add_cert_ver_for_site.rake @@ -14,13 +14,13 @@ namespace :create_site do location_path = site_construct.cert_ver_location_path nginx_config = exec_command_by_user(ssh,"cat #{site_construct.nginx_file}") if !site_construct.cert_ver_added_text.nil? - nginx_config = nginx_config.gsub(site_construct.cert_ver_added_text,'') + nginx_config = nginx_config.sub(site_construct.cert_ver_added_text,'') end file_name = location_path.split('/')[-1] file_path = "#{site_construct.path}/#{site_construct.site_name}/tmp/#{file_name}" site_construct.cert_ver_added_text = " location #{location_path}{#add_by_site_module\n alias #{file_path};\n }" site_construct.save - server_array = nginx_config.scan(/^[ \t]*server[ \t]{(?:(?!server[ \t]*{).)+}/m) + server_array = nginx_config.scan(/^[ \t]*server[ \t]*{(?:(?!server[ \t]*{).)+}/m) server_array.each do |server| tmp = server[0...-1] + site_construct.cert_ver_added_text + "\n}" nginx_config = nginx_config.sub(server,tmp) diff --git a/lib/tasks/change_site_server_name.rake b/lib/tasks/change_site_server_name.rake index 281dad8..e565a4b 100644 --- a/lib/tasks/change_site_server_name.rake +++ b/lib/tasks/change_site_server_name.rake @@ -24,7 +24,7 @@ namespace :create_site do end def exec_command_by_user(session,command) output = session.exec!(command) - return output[0..-1] + return output[0...-1].gsub(/^\n[\n]+/,'') end def exec_ssh_command_by_sudo(session,command) output = session.exec!("echo '#{@password}' | sudo -S #{command}")