1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-10-06 21:39:50 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: 修改nginx配置文件

Browse source
This commit is contained in:
zhengkunwang223 2022-11-20 22:49:32 +08:00 • committed by zhengkunwang223
parent 6f7584b72d
commit b8473096f8
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/nginx/versions/1.23.1/docker-compose.yml
View file

@ -1,12 +1,10 @@
version: '3'
services: services:
nginx1.23.1: nginx1.23.1:
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
image: nginx:1.23.1 image: nginx:1.23.1
restart: always restart: always
network_mode: host network_mode: host
ports:
- ${PANEL_APP_PORT_HTTP}:80
- ${PANEL_APP_PORT_HTTPS}:443
volumes: volumes:
- ./conf/nginx.conf:/etc/nginx/nginx.conf - ./conf/nginx.conf:/etc/nginx/nginx.conf
- ./log:/var/log/nginx - ./log:/var/log/nginx

5
backend/app/service/app_utils.go
View file

@ -419,6 +419,11 @@ func copyAppData(key, version, installName string, params map[string]interface{}
installDir := path.Join(constant.AppInstallDir, key) installDir := path.Join(constant.AppInstallDir, key)
installVersionDir := path.Join(installDir, version) installVersionDir := path.Join(installDir, version)
fileOp := files.NewFileOp() fileOp := files.NewFileOp()
if fileOp.Stat(installVersionDir) {
if err = fileOp.DeleteDir(installVersionDir); err != nil {
return
}
}
if err = fileOp.Copy(resourceDir, installVersionDir); err != nil { if err = fileOp.Copy(resourceDir, installVersionDir); err != nil {
return return
} }

11
backend/init/viper/viper.go
View file

@ -43,13 +43,12 @@ func InitDir() {
constant.BackupDir = path.Join(constant.DefaultDataDir, "backup") constant.BackupDir = path.Join(constant.DefaultDataDir, "backup")
constant.AppBackupDir = path.Join(constant.BackupDir, "apps") constant.AppBackupDir = path.Join(constant.BackupDir, "apps")
dirs := []string{constant.DefaultDataDir, constant.ResourceDir, constant.AppResourceDir, constant.AppInstallDir, constant.BackupDir, constant.AppBackupDir}
fileOp := files.NewFileOp() fileOp := files.NewFileOp()
createDir(fileOp, constant.DefaultDataDir) for _, dir := range dirs {
createDir(fileOp, constant.ResourceDir) createDir(fileOp, dir)
createDir(fileOp, constant.AppResourceDir) }
createDir(fileOp, constant.AppInstallDir)
createDir(fileOp, constant.BackupDir)
createDir(fileOp, constant.AppBackupDir)
} }
func createDir(fileOp files.FileOp, dirPath string) { func createDir(fileOp files.FileOp, dirPath string) {