astra/owpengram-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Compare commits

base: astra:39f5468b8b5352ba99d13681b286ea166c75714e
Branches Tags
astra:main
..
compare: astra:4cbd4c0c9e34be7ecff803c6674d89678def47c5
Branches Tags
astra:main

No commits in common. "39f5468b8b5352ba99d13681b286ea166c75714e" and "4cbd4c0c9e34be7ecff803c6674d89678def47c5" have entirely different histories.
39f5468b8b ... 4cbd4c0c9e

2 changed files with 12 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmd/telesrv-admin/web/src/pages/ServerSettingsPage.tsx
View file

@ -415,9 +415,9 @@ function EnvSection() {
setError(""); setError("");
try { try {
const g = await api.serverEnv(); const g = await api.serverEnv();
setGroups(g ?? []); setGroups(g);
const next: Record<string, string> = {}; const next: Record<string, string> = {};
for (const group of g ?? []) { for (const group of g) {
for (const field of group.fields) { for (const field of group.fields) {
next[field.key] = field.value; next[field.key] = field.value;
} }

30
internal/procctl/procctl.go
View file

@ -517,33 +517,23 @@ type EnvGroup struct {
Fields []EnvField `json:"fields"` Fields []EnvField `json:"fields"`
} }
// ReadEnvGroups parses .env into the same panel-visible groups // ReadEnvGroups parses .env.example into the same panel-visible groups
// server-panel.py's parse_env_template() parses out of .env.example // server-panel.py's parse_env_template() does (identical header/format
// (identical header/format rules -- see that function's docstring). .env // rules -- see that function's docstring), then fills in each field's
// carries the same comments/group headers as .env.example because // current effective value from .env.
// WriteEnvValues always rewrites it from .env.example's exact text with
// just the values swapped in, so .env is the more current source once it
// exists -- it reflects fields added to .env.example after this install's
// .env was first created only once WriteEnvValues has run again, same as
// server-panel.py. Falls back to .env.example when .env doesn't exist yet
// (a fresh install before Setup has written one).
func (m *Manager) ReadEnvGroups() ([]EnvGroup, error) { func (m *Manager) ReadEnvGroups() ([]EnvGroup, error) {
tmplPath := filepath.Join(m.Root, ".env") tmplPath := filepath.Join(m.Root, ".env.example")
tmplData, err := os.ReadFile(tmplPath) tmplData, err := os.ReadFile(tmplPath)
if os.IsNotExist(err) {
tmplPath = filepath.Join(m.Root, ".env.example")
tmplData, err = os.ReadFile(tmplPath)
}
if os.IsNotExist(err) { if os.IsNotExist(err) {
// A nil slice here would marshal to JSON null instead of [] -- the // A nil slice here would marshal to JSON null instead of [] -- the
// admin UI's env editor unconditionally calls .reduce()/.map() on // admin UI's env editor unconditionally calls .reduce()/.map() on
// this response and crashes on null. Neither .env nor .env.example // this response and crashes on null. .env.example isn't shipped
// exists inside the container image before Setup has run, so this // inside the container image, so this path is the normal case in
// path is the normal pre-setup case, not an edge case. // production, not an edge case.
return []EnvGroup{}, nil return []EnvGroup{}, nil
} }
if err != nil { if err != nil {
return nil, fmt.Errorf("read %s: %w", filepath.Base(tmplPath), err) return nil, fmt.Errorf("read .env.example: %w", err)
} }
envValues, err := m.readEnvFile() envValues, err := m.readEnvFile()
if err != nil { if err != nil {
@ -622,7 +612,7 @@ func (m *Manager) ReadEnvGroups() ([]EnvGroup, error) {
inCommentRun = false inCommentRun = false
} }
out := make([]EnvGroup, 0, len(groups)) out := groups[:0]
for _, g := range groups { for _, g := range groups {
if len(g.Fields) > 0 { if len(g.Fields) > 0 {
out = append(out, g) out = append(out, g)