MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update data path if the server data directory is a symlink

Browse Source
This commit is contained in:
Dane Everitt 2020-09-01 19:24:50 -07:00
parent 481df3d543
commit b6008108ac
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
config/config_system.go
View File

@ -2,8 +2,10 @@ package config
import ( import (
"github.com/apex/log" "github.com/apex/log"
"github.com/pkg/errors"
"os" "os"
"path" "path"
"path/filepath"
) )
// Defines basic system configuration settings. // Defines basic system configuration settings.
@ -55,6 +57,22 @@ func (sc *SystemConfiguration) ConfigureDirectories() error {
return err return err
} }
// There are a non-trivial number of users out there whose data directories are actually a
// symlink to another location on the disk. If we do not resolve that final destination at this
// point things will appear to work, but endless errors whill be encountered when we try to
// verify accessed paths since they will all end up resolving outside the expected data directory.
//
// For the sake of automating away as much of this as possible, see if the data directory is a
// symlink, and if so resolve to its final real path, and then update the configuration to use
// that.
if d, err := filepath.EvalSymlinks(sc.Data); err != nil {
if !os.IsNotExist(err) {
return errors.WithStack(err)
}
} else if d != sc.Data {
sc.Data = d
}
log.WithField("path", sc.Data).Debug("ensuring server data directory exists") log.WithField("path", sc.Data).Debug("ensuring server data directory exists")
if err := os.MkdirAll(sc.Data, 0700); err != nil { if err := os.MkdirAll(sc.Data, 0700); err != nil {
return err return err