From 059c3a0b80939a975e7c9a63ad70e24d436b5263 Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <31820853+zhengkunwang223@users.noreply.github.com>
Date: Fri, 14 Apr 2023 17:16:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=9B=E5=BB=BA=20PHP=20=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E7=8E=AF=E5=A2=83=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?index=E7=9B=AE=E5=BD=95=E6=96=87=E4=BB=B6=E5=92=8C=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E6=9D=83=E9=99=90=20(#644)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/website_utils.go | 34 ++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/backend/app/service/website_utils.go b/backend/app/service/website_utils.go
index 0bd235fcb..0fe47b38c 100644
--- a/backend/app/service/website_utils.go
+++ b/backend/app/service/website_utils.go
@@ -2,6 +2,7 @@ package service
 
 import (
 	"fmt"
+	"github.com/1Panel-dev/1Panel/backend/utils/cmd"
 	"path"
 	"strconv"
 	"strings"
@@ -58,8 +59,6 @@ func createIndexFile(website *model.Website, runtime *model.Runtime) error {
 		if runtime.Type == constant.RuntimePHP {
 			indexPath = path.Join(indexFolder, "index.php")
 			indexContent = string(nginx_conf.IndexPHP)
-		} else {
-			return nil
 		}
 	}
 
@@ -74,6 +73,11 @@ func createIndexFile(website *model.Website, runtime *model.Runtime) error {
 			return err
 		}
 	}
+	if runtime.Resource == constant.ResourceAppstore {
+		if err := chownRootDir(indexFolder); err != nil {
+			return err
+		}
+	}
 	if err := fileOp.WriteFile(indexPath, strings.NewReader(indexContent), 0755); err != nil {
 		return err
 	}
@@ -97,19 +101,21 @@ func createWebsiteFolder(nginxInstall model.AppInstall, website *model.Website,
 		if err := fileOp.CreateFile(path.Join(siteFolder, "log", "error.log")); err != nil {
 			return err
 		}
-		if err := fileOp.CreateDir(path.Join(siteFolder, "index"), 0755); err != nil {
+		if err := fileOp.CreateDir(path.Join(siteFolder, "index"), 0775); err != nil {
 			return err
 		}
 		if err := fileOp.CreateDir(path.Join(siteFolder, "ssl"), 0755); err != nil {
 			return err
 		}
-		if website.Type == constant.Runtime && runtime.Type == constant.RuntimePHP && runtime.Resource == constant.ResourceLocal {
-			phpPoolDir := path.Join(siteFolder, "php-pool")
-			if err := fileOp.CreateDir(phpPoolDir, 0755); err != nil {
-				return err
-			}
-			if err := fileOp.CreateFile(path.Join(phpPoolDir, "php-fpm.sock")); err != nil {
-				return err
+		if website.Type == constant.Runtime {
+			if runtime.Type == constant.RuntimePHP && runtime.Resource == constant.ResourceLocal {
+				phpPoolDir := path.Join(siteFolder, "php-pool")
+				if err := fileOp.CreateDir(phpPoolDir, 0755); err != nil {
+					return err
+				}
+				if err := fileOp.CreateFile(path.Join(phpPoolDir, "php-fpm.sock")); err != nil {
+					return err
+				}
 			}
 		}
 		if website.Type == constant.Static || website.Type == constant.Runtime {
@@ -505,3 +511,11 @@ func checkIsLinkApp(website model.Website) bool {
 	}
 	return false
 }
+
+func chownRootDir(path string) error {
+	_, err := cmd.ExecWithTimeOut(fmt.Sprintf("chown -R 1000:1000 %s", path), 1*time.Second)
+	if err != nil {
+		return err
+	}
+	return nil
+}