xfy/lolly
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(config): 调整 include 配置示例位置

Browse Source 
将 include 配置示例从 SSL 配置前移动到变量配置后的位置，
使配置示例的组织结构更加合理。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
xfy 2026-04-17 10:41:13 +08:00
parent c929d320c6
commit bbf8032e6a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/config/defaults.go
View File

@ -398,14 +398,6 @@ func GenerateConfigYAML(cfg *Config) ([]byte, error) {
buf.WriteString(" # # replacement: \"$scheme://$host/$1\" # 使用捕获组 $1\n")
buf.WriteString("\n")
// include 配置
buf.WriteString("# 配置文件拆分（include 机制）\n")
buf.WriteString("# include:\n")
buf.WriteString("# - path: \"conf.d/*.yaml\" # 相对路径 + glob 模式\n")
buf.WriteString("# - path: \"sites/example.yaml\" # 单个文件引入\n")
buf.WriteString("# 支持循环检测和深度限制（最大 10 层）\n")
buf.WriteString("\n")
// SSL 配置
buf.WriteString(" # SSL/TLS 配置\n")
buf.WriteString(" # ssl:\n")
@ -663,6 +655,14 @@ func GenerateConfigYAML(cfg *Config) ([]byte, error) {
buf.WriteString(" set: {} # 自定义变量集合，如 {app_name: \"lolly\"}\n")
buf.WriteString(" # 注意：变量名只允许字母、数字、下划线，不能与内置变量冲突\n")
buf.WriteString(" # 不能以 arg_、http_、cookie_ 开头（这些是动态变量前缀）\n")
buf.WriteString("\n")
// include 配置
buf.WriteString("# 配置文件拆分（include 机制）\n")
buf.WriteString("# include:\n")
buf.WriteString("# - path: \"conf.d/*.yaml\" # 相对路径 + glob 模式\n")
buf.WriteString("# - path: \"sites/example.yaml\" # 单个文件引入\n")
buf.WriteString("# 支持循环检测和深度限制（最大 10 层）\n")
return buf.Bytes(), nil
}