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

Run chown when starting a server

Browse Source
This commit is contained in:
Dane Everitt 2020-08-18 20:27:42 -07:00
parent a24a5466e5
commit 4a2a0b25bb
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
environment/docker/power.go
View File

@ -102,19 +102,6 @@ func (e *Environment) Start() error {
return errors.WithStack(err) return errors.WithStack(err)
} }
// Update the configuration files defined for the server before beginning the boot process.
// This process executes a bunch of parallel updates, so we just block until that process
// is completee. Any errors as a result of this will just be bubbled out in the logger,
// we don't need to actively do anything about it at this point, worst comes to worst the
// server starts in a weird state and the user can manually adjust.
// e.Server.UpdateConfigurationFiles()
//
// // Reset the permissions on files for the server before actually trying
// // to start it.
// if err := e.Server.Filesystem.Chown("/"); err != nil {
// return errors.WithStack(err)
// }
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10) ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
defer cancel() defer cancel()

12
server/power.go
View File

@ -143,7 +143,19 @@ func (s *Server) onBeforeStart() error {
return errors.New("cannot start server, not enough disk space available") return errors.New("cannot start server, not enough disk space available")
} }
// Update the configuration files defined for the server before beginning the boot process.
// This process executes a bunch of parallel updates, so we just block until that process
// is completee. Any errors as a result of this will just be bubbled out in the logger,
// we don't need to actively do anything about it at this point, worst comes to worst the
// server starts in a weird state and the user can manually adjust.
s.PublishConsoleOutputFromDaemon("Updating process configuration files...")
s.UpdateConfigurationFiles() s.UpdateConfigurationFiles()
s.PublishConsoleOutputFromDaemon("Ensuring file permissions are set correctly, this could take a few seconds...")
// Ensure all of the server file permissions are set correctly before booting the process.
if err := s.Filesystem.Chown("/"); err != nil {
return errors.WithMessage(err, "failed to chown root server directory during pre-boot process")
}
return nil return nil
} }