修复目录权限问题

This commit is contained in:
ryan
2026-06-22 23:21:04 +08:00
parent 8ed91dbf97
commit 49eae80c78
6 changed files with 57 additions and 2 deletions
+18
View File
@@ -302,6 +302,9 @@ func (m *Manager) ensureOpenRestyWorkerReadAccess() error {
if pidPath := m.pidRuntimePath(); pidPath != "" {
targets = append(targets, filepath.Dir(pidPath))
}
if proxyCacheDir := m.proxyCacheRuntimeDir(); proxyCacheDir != "" {
targets = append(targets, proxyCacheDir)
}
seen := make(map[string]struct{}, len(targets))
for _, target := range targets {
cleaned := filepath.Clean(strings.TrimSpace(target))
@@ -1263,6 +1266,14 @@ func (m *Manager) renderMainConfig(content string) string {
}
}
}
if proxyCacheDir := m.proxyCacheRuntimeDir(); proxyCacheDir != "" {
slashProxyCache := filepath.ToSlash(proxyCacheDir)
rendered = strings.ReplaceAll(rendered, openrestyrender.ProxyCachePathPlaceholder, slashProxyCache)
rendered = strings.ReplaceAll(rendered, "/var/cache/openresty", slashProxyCache)
if err := os.MkdirAll(proxyCacheDir, nginxDirPerm); err != nil {
slog.Warn("ensure proxy cache directory failed", "path", proxyCacheDir, "error", err)
}
}
if luaDir := m.luaRuntimePath(); luaDir != "" {
rendered = strings.ReplaceAll(rendered, openrestyrender.LuaDirPlaceholder, luaDir)
}
@@ -1398,6 +1409,13 @@ func (m *Manager) nginxCacheRuntimeDir() string {
return ""
}
func (m *Manager) proxyCacheRuntimeDir() string {
if varRoot := m.varRuntimeDir(); varRoot != "" {
return filepath.Join(varRoot, "cache", "openflare_proxy")
}
return ""
}
func (m *Manager) luaRuntimePath() string {
if strings.TrimSpace(m.NginxLuaDir) == "" {
return ""