André ColombandGitHub
5237337626
* cmd/syncthing: Remove unnecessary function arguments. The openGUI() function does not need a device ID to work, and there is only one caller anyway which uses EmptyDeviceID. The loadOrDefaultConfig() function is always called with the same dummy values. * cmd/syncthing: Avoid misleading info messages from monitor process. In order to check whether panic reporting is enabled, the monitor process utilizes the loadOrDefaultConfig() function. In case there is no config file yet, info messages may be logged during creation if the config Wrapper, which is discarded immediately after. Stop using the DefaultConfig() utility function from lib/syncthing and directly generate a minimal config instead to avoid these. Add comments to loadOrDefaultConfig() explaining its limited purpose. * cmd/syncthing/generate: Always write updated config file. Previously, an existing config file was left untouched unless either of the --gui-user or --gui-password options was given. Remove that condition and simplify the checking code. * lib/config: Factor out ProbeFreePorts(). * cmd/syncthing: Add option --skip-port-probing. Applies to both the "generate" and "serve" subcommands, as well as the deprecated --generate option, just as the --no-default-folder flag.
17 lines
804 B
Go
17 lines
804 B
Go
// Copyright (C) 2021 The Syncthing Authors.
|
|
//
|
|
// This Source Code Form is subject to the terms of the Mozilla Public
|
|
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
// You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
|
|
package cmdutil
|
|
|
|
// CommonOptions are reused among several subcommands
|
|
type CommonOptions struct {
|
|
buildCommonOptions
|
|
ConfDir string `name:"config" placeholder:"PATH" help:"Set configuration directory (config and keys)"`
|
|
HomeDir string `name:"home" placeholder:"PATH" help:"Set configuration and data directory"`
|
|
NoDefaultFolder bool `env:"STNODEFAULTFOLDER" help:"Don't create the \"default\" folder on first startup"`
|
|
SkipPortProbing bool `help:"Don't try to find free ports for GUI and listen addresses on first startup"`
|
|
}
|