From 63df48fba43c89d9e48d941813fec615aebb4ac3 Mon Sep 17 00:00:00 2001
From: soxft <email@xcsoft.top>
Date: Tue, 28 Jun 2022 06:02:23 +0000
Subject: [PATCH] fix

---
 class/core/site_api.py | 13 +++----------
 data/tpl/nginx.conf    |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/class/core/site_api.py b/class/core/site_api.py
index fb9c623c1..df6c22dfb 100755
--- a/class/core/site_api.py
+++ b/class/core/site_api.py
@@ -1714,21 +1714,14 @@ include enable-php-''' % (fix.strip().replace(',', '|'), domains.strip().replace
         content = content.replace('{$ROOT_DIR}', self.sitePath)
         content = content.replace('{$PHPVER}', self.phpVersion)
         content = content.replace('{$OR_REWRITE}', self.rewritePath)
+        content = content.replace('{$OR_REDIRECT}', self.redirectPath)
 
         logsPath = mw.getLogsDir()
         content = content.replace('{$LOGPATH}', logsPath)
         mw.writeFile(vhost_file, content)
-
-        rewrite_content = '''
-location /{
-    if (!-e $request_filename) {
-       rewrite  ^(.*)$  /index.php/$1  last;
-       break;
-    }
-}
-        '''
+        
         rewrite_file = self.rewritePath + '/' + self.siteName + '.conf'
-        mw.writeFile(rewrite_file, rewrite_content)
+        mw.writeFile(rewrite_file, "")
 
     def add(self, webname, port, ps, path, version):
         siteMenu = json.loads(webname)
diff --git a/data/tpl/nginx.conf b/data/tpl/nginx.conf
index 32c63f291..5c3630f7e 100755
--- a/data/tpl/nginx.conf
+++ b/data/tpl/nginx.conf
@@ -23,7 +23,7 @@ server
     #REWRITE-END
 
     #301-START
-    include /redirect/{$SERVER_NAME}/*.conf;
+    include {$OR_REDIRECT}/{$SERVER_NAME}/*.conf;
     ##301-END
     
     #禁止访问的文件或目录