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

Fix SFTP default configuration; closes pterodactyl/panel#2045

Browse Source
This commit is contained in:
Dane Everitt 2020-05-25 15:51:36 -07:00
parent bd063682dc
commit 6d7ab865d7
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/root.go
View File

@ -196,10 +196,8 @@ func rootCmdRun(*cobra.Command, []string) {
// Wait until all of the servers are ready to go before we fire up the HTTP server. // Wait until all of the servers are ready to go before we fire up the HTTP server.
wg.Wait() wg.Wait()
// If the SFTP subsystem should be started, do so now. // Initalize SFTP.
if c.System.Sftp.UseInternalSystem { sftp.Initialize(c)
sftp.Initialize(c)
}
// Ensure the archive directory exists. // Ensure the archive directory exists.
if err := os.MkdirAll(c.System.ArchiveDirectory, 0755); err != nil { if err := os.MkdirAll(c.System.ArchiveDirectory, 0755); err != nil {

3
config/config.go
View File

@ -84,9 +84,6 @@ type Configuration struct {
// Defines the configuration of the internal SFTP server. // Defines the configuration of the internal SFTP server.
type SftpConfiguration struct { type SftpConfiguration struct {
// If set to false, the internal SFTP server will not be booted and you will need
// to run the SFTP server independent of this program.
UseInternalSystem bool `default:"true" json:"use_internal" yaml:"use_internal"`
// If set to true disk checking will not be performed. This will prevent the SFTP // If set to true disk checking will not be performed. This will prevent the SFTP
// server from checking the total size of a directory when uploading files. // server from checking the total size of a directory when uploading files.
DisableDiskChecking bool `default:"false" yaml:"disable_disk_checking"` DisableDiskChecking bool `default:"false" yaml:"disable_disk_checking"`

2
config/config_system.go
View File

@ -51,7 +51,7 @@ type SystemConfiguration struct {
// the user did not press the stop button, but the process stopped cleanly. // the user did not press the stop button, but the process stopped cleanly.
DetectCleanExitAsCrash bool `default:"true" yaml:"detect_clean_exit_as_crash"` DetectCleanExitAsCrash bool `default:"true" yaml:"detect_clean_exit_as_crash"`
Sftp *SftpConfiguration `yaml:"sftp"` Sftp SftpConfiguration `yaml:"sftp"`
} }
// Ensures that all of the system directories exist on the system. These directories are // Ensures that all of the system directories exist on the system. These directories are