beenull/sftpgo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean config dir

Browse source 
Fixes #80
This commit is contained in:
Nicola Murino 2020-03-02 22:56:14 +01:00
parent ed11e1128a
commit df67f4ef34
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/install_windows.go
View file

@ -2,6 +2,7 @@ package cmd
import ( import (
"fmt" "fmt"
"path/filepath"
"github.com/drakkan/sftpgo/service" "github.com/drakkan/sftpgo/service"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -18,7 +19,7 @@ sftpgo service install
Please take a look at the usage below to customize the startup options`, Please take a look at the usage below to customize the startup options`,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
s := service.Service{ s := service.Service{
ConfigDir: configDir, ConfigDir: filepath.Clean(configDir),
ConfigFile: configFile, ConfigFile: configFile,
LogFilePath: logFilePath, LogFilePath: logFilePath,
LogMaxSize: logMaxSize, LogMaxSize: logMaxSize,

2
cmd/portable.go
View file

@ -77,7 +77,7 @@ Please take a look at the usage below to customize the serving parameters`,
portableGCSAutoCredentials = 0 portableGCSAutoCredentials = 0
} }
service := service.Service{ service := service.Service{
ConfigDir: defaultConfigDir, ConfigDir: filepath.Clean(defaultConfigDir),
ConfigFile: defaultConfigName, ConfigFile: defaultConfigName,
LogFilePath: portableLogFile, LogFilePath: portableLogFile,
LogMaxSize: defaultLogMaxSize, LogMaxSize: defaultLogMaxSize,

4
cmd/serve.go
View file

@ -1,6 +1,8 @@
package cmd package cmd
import ( import (
"path/filepath"
"github.com/drakkan/sftpgo/service" "github.com/drakkan/sftpgo/service"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -16,7 +18,7 @@ sftpgo serve
Please take a look at the usage below to customize the startup options`, Please take a look at the usage below to customize the startup options`,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
service := service.Service{ service := service.Service{
ConfigDir: configDir, ConfigDir: filepath.Clean(configDir),
ConfigFile: configFile, ConfigFile: configFile,
LogFilePath: logFilePath, LogFilePath: logFilePath,
LogMaxSize: logMaxSize, LogMaxSize: logMaxSize,

3
cmd/start_windows.go
View file

@ -2,6 +2,7 @@ package cmd
import ( import (
"fmt" "fmt"
"path/filepath"
"github.com/drakkan/sftpgo/service" "github.com/drakkan/sftpgo/service"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -13,7 +14,7 @@ var (
Short: "Start SFTPGo Windows Service", Short: "Start SFTPGo Windows Service",
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
s := service.Service{ s := service.Service{
ConfigDir: configDir, ConfigDir: filepath.Clean(configDir),
ConfigFile: configFile, ConfigFile: configFile,
LogFilePath: logFilePath, LogFilePath: logFilePath,
LogMaxSize: logMaxSize, LogMaxSize: logMaxSize,