From 920afd2f3985ba427ef1631901667c50eff8f8cf Mon Sep 17 00:00:00 2001 From: mercury Date: Wed, 28 Jun 2023 10:07:48 +0400 Subject: [PATCH] Revert "fix server_name change" This reverts commit ad2a00b5e053eb970e710e93990aedbbfbecfaa3. --- app/bot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/bot.php b/app/bot.php index 5cc89f4..f89316e 100644 --- a/app/bot.php +++ b/app/bot.php @@ -837,7 +837,7 @@ class Bot $t = file_get_contents('/config/nginx_default.conf'); if (!empty($json['pac']['domain'])) { - $t = preg_replace('/server_name([^\n]+)?;/', "server_name {$json['pac']['domain']}", $t); + $t = preg_replace('/server_name([^\n]+)?/', "server_name {$json['pac']['domain']};", $t); preg_match_all('~#-domain.+?#-domain~s', $t, $m); foreach ($m[0] as $k => $v) { $t = preg_replace('~#-domain.+?#-domain~s', $this->uncomment($v, 'domain'), $t, 1); @@ -1019,7 +1019,7 @@ class Bot $conf = $this->getPacConf(); $conf['domain'] = idn_to_ascii($domain); $nginx = file_get_contents('/config/nginx.conf'); - $t = preg_replace('/server_name([^\n]+)?;/', "server_name {$conf['domain']}", $nginx); + $t = preg_replace('/server_name([^\n]+)?/', "server_name {$conf['domain']};", $nginx); preg_match_all('~#-domain.+?#-domain~s', $t, $m); foreach ($m[0] as $k => $v) { $t = preg_replace('~#-domain.+?#-domain~s', $this->uncomment($v, 'domain'), $t, 1);