Merge 4d55d521894b58488ee0573e2d6fe05c02bd4fb1 into f7efbfeec53b64b85b256124b896430289933757

fix: typo (#3938 )
Update root.go
2025-05-09 07:58:26 +00:00 · 2024-01-16 12:41:39 +00:00 · 2024-01-16 18:38:54 +08:00 · 2023-12-29 11:25:55 +08:00
2 changed files with 2 additions and 2 deletions
--- a/cmd/frpc/sub/root.go
+++ b/cmd/frpc/sub/root.go
@ -43,7 +43,7 @@ var (
 )

 func init() {
-	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "./frpc.ini", "config file of frpc")
+	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "./frpc.toml", "config file of frpc")
 	rootCmd.PersistentFlags().StringVarP(&cfgDir, "config_dir", "", "", "config directory, run one frpc service for each file in config directory")
 	rootCmd.PersistentFlags().BoolVarP(&showVersion, "version", "v", false, "version of frpc")
 	rootCmd.PersistentFlags().BoolVarP(&strictConfigMode, "strict_config", "", false, "strict config parsing mode, unknown fields will cause an error")
--- a/conf/frps_full_example.toml
+++ b/conf/frps_full_example.toml
@ -129,7 +129,7 @@ allowPorts = [
 maxPortsPerClient = 0

 # If subDomainHost is not empty, you can set subdomain when type is http or https in frpc's configure file
-# When subdomain is est, the host used by routing is test.frps.com
+# When subdomain is test, the host used by routing is test.frps.com
 subDomainHost = "frps.com"

 # custom 404 page for HTTP requests
Author	SHA1	Message	Date
CChuancey	5ed6e024a0	Merge 4d55d521894b58488ee0573e2d6fe05c02bd4fb1 into f7efbfeec53b64b85b256124b896430289933757	2024-01-16 12:41:39 +00:00
Remember	f7efbfeec5	fix: typo (#3938 )	2024-01-16 18:38:54 +08:00
CChuancey	4d55d52189	Update root.go 默认的配置文件已经更新为toml格式	2023-12-29 11:25:55 +08:00