SVI/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-05 09:03:54 -04:00
Code Issues 3.0k Packages Projects Releases 10 Wiki Activity

[client]: deprecate config flag (#4224)

Browse Source
This commit is contained in:
hakansa
2025-07-25 18:43:48 +03:00
committed by GitHub
parent cb8b6ca59b
commit 3d9be5098b
5 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/cmd/login.go
View File

@@ -26,7 +26,7 @@ import (
func init() { func init() {
loginCmd.PersistentFlags().BoolVar(&noBrowser, noBrowserFlag, false, noBrowserDesc) loginCmd.PersistentFlags().BoolVar(&noBrowser, noBrowserFlag, false, noBrowserDesc)
loginCmd.PersistentFlags().StringVar(&profileName, profileNameFlag, "", profileNameDesc) loginCmd.PersistentFlags().StringVar(&profileName, profileNameFlag, "", profileNameDesc)
loginCmd.PersistentFlags().StringVarP(&configPath, "config", "c", "", "Netbird config file location") loginCmd.PersistentFlags().StringVarP(&configPath, "config", "c", "", "(DEPRECATED) Netbird config file location")
} }
var loginCmd = &cobra.Command{ var loginCmd = &cobra.Command{
@@ -228,15 +228,10 @@ func doForegroundLogin(ctx context.Context, cmd *cobra.Command, setupKey string,
// update host's static platform and system information // update host's static platform and system information
system.UpdateStaticInfo() system.UpdateStaticInfo()
var configFilePath string configFilePath, err := activeProf.FilePath()
if configPath != "" { if err != nil {
configFilePath = configPath return fmt.Errorf("get active profile file path: %v", err)
} else {
var err error
configFilePath, err = activeProf.FilePath()
if err != nil {
return fmt.Errorf("get active profile file path: %v", err)
}
} }
config, err := profilemanager.ReadConfig(configFilePath) config, err := profilemanager.ReadConfig(configFilePath)

1
client/cmd/root.go
View File

@@ -126,6 +126,7 @@ func init() {
rootCmd.PersistentFlags().StringVar(&preSharedKey, preSharedKeyFlag, "", "Sets Wireguard PreSharedKey property. If set, then only peers that have the same key can communicate.") rootCmd.PersistentFlags().StringVar(&preSharedKey, preSharedKeyFlag, "", "Sets Wireguard PreSharedKey property. If set, then only peers that have the same key can communicate.")
rootCmd.PersistentFlags().StringVarP(&hostName, "hostname", "n", "", "Sets a custom hostname for the device") rootCmd.PersistentFlags().StringVarP(&hostName, "hostname", "n", "", "Sets a custom hostname for the device")
rootCmd.PersistentFlags().BoolVarP(&anonymizeFlag, "anonymize", "A", false, "anonymize IP addresses and non-netbird.io domains in logs and status output") rootCmd.PersistentFlags().BoolVarP(&anonymizeFlag, "anonymize", "A", false, "anonymize IP addresses and non-netbird.io domains in logs and status output")
rootCmd.PersistentFlags().StringVarP(&configPath, "config", "c", defaultConfigPath, "(DEPRECATED) Netbird config file location")
rootCmd.AddCommand(upCmd) rootCmd.AddCommand(upCmd)
rootCmd.AddCommand(downCmd) rootCmd.AddCommand(downCmd)

2
client/cmd/service_installer.go
View File

@@ -31,8 +31,6 @@ func buildServiceArguments() []string {
args := []string{ args := []string{
"service", "service",
"run", "run",
"--config",
configPath,
"--log-level", "--log-level",
logLevel, logLevel,
"--daemon-addr", "--daemon-addr",

14
client/cmd/up.go
View File

@@ -78,7 +78,7 @@ func init() {
upCmd.PersistentFlags().BoolVar(&noBrowser, noBrowserFlag, false, noBrowserDesc) upCmd.PersistentFlags().BoolVar(&noBrowser, noBrowserFlag, false, noBrowserDesc)
upCmd.PersistentFlags().StringVar(&profileName, profileNameFlag, "", profileNameDesc) upCmd.PersistentFlags().StringVar(&profileName, profileNameFlag, "", profileNameDesc)
upCmd.PersistentFlags().StringVarP(&configPath, "config", "c", "", "Netbird config file location") upCmd.PersistentFlags().StringVarP(&configPath, "config", "c", "", "(DEPRECATED) Netbird config file location")
} }
@@ -155,15 +155,9 @@ func runInForegroundMode(ctx context.Context, cmd *cobra.Command, activeProf *pr
return err return err
} }
var configFilePath string configFilePath, err := activeProf.FilePath()
if configPath != "" { if err != nil {
configFilePath = configPath return fmt.Errorf("get active profile file path: %v", err)
} else {
var err error
configFilePath, err = activeProf.FilePath()
if err != nil {
return fmt.Errorf("get active profile file path: %v", err)
}
} }
ic, err := setupConfig(customDNSAddressConverted, cmd, configFilePath) ic, err := setupConfig(customDNSAddressConverted, cmd, configFilePath)

2
release_files/systemd/netbird@.service
View File

@@ -7,7 +7,7 @@ Wants=network-online.target
[Service] [Service]
Type=simple Type=simple
EnvironmentFile=-/etc/default/netbird EnvironmentFile=-/etc/default/netbird
ExecStart=/usr/bin/netbird service run --log-file /var/log/netbird/client-%i.log --config /etc/netbird/%i.json --daemon-addr unix:///var/run/netbird/%i.sock $FLAGS ExecStart=/usr/bin/netbird service run --log-file /var/log/netbird/client-%i.log --daemon-addr unix:///var/run/netbird/%i.sock $FLAGS
Restart=on-failure Restart=on-failure
RestartSec=5 RestartSec=5
TimeoutStopSec=10 TimeoutStopSec=10