start refactoring

conf/frpc.ini

@@ -17,70 +17,58 @@ log_level = info
 log_max_days = 3
 
 # for authentication
-auth_token = 123
-
-# for privilege mode
 privilege_token = 12345678
 
+# connections will be established in advance, default value is zero
+pool_count = 5
+
+# your proxy name will be changed to {user}.{proxy}
+user = your_name
+
 # heartbeat configure, it's not recommended to modify the default value
 # the default value of heartbeat_interval is 10 and heartbeat_timeout is 30
 # heartbeat_interval = 10
 # heartbeat_timeout = 30
 
 # ssh is the proxy name same as server's configuration
+# if user in [common] section is not empty, it will be changed to {user}.{proxy} such as your_name.ssh
 [ssh]
-# tcp | http, default is tcp
+# tcp | udp | http | https, default is tcp
 type = tcp
 local_ip = 127.0.0.1
 local_port = 22
 # true or false, if true, messages between frps and frpc will be encrypted, default is false
 use_encryption = false
-# default is false
-use_gzip = false
+# if true, message will be compressed
+use_compression = false
+# remote port listen by frps
+remote_port = 6001
 
 [dns]
 type = udp
 local_ip = 114.114.114.114
 local_port = 53
 
-# Resolve your domain names to [server_addr] so you can use http://web01.yourdomain.com to browse web01 and http://web02.yourdomain.com to browse web02, the domains are set in frps.ini
+# Resolve your domain names to [server_addr] so you can use http://web01.yourdomain.com to browse web01 and http://web02.yourdomain.com to browse web02
 [web01]
 type = http
 local_ip = 127.0.0.1
 local_port = 80
-use_gzip = true
-# connections will be established in advance, default value is zero
-pool_count = 20
+use_compression = true
 # http username and password are safety certification for http protocol
 # if not set, you can access this custom_domains without certification
 http_user = admin
 http_pwd = admin
 # if domain for frps is frps.com, then you can access [web01] proxy by URL http://test.frps.com
-subdomain = test
+subdomain = web01
 
 [web02]
 type = http
 local_ip = 127.0.0.1
 local_port = 8000
-
-[privilege_ssh]
-# if privilege_mode is enabled, this proxy will be created automatically
-privilege_mode = true
-type = tcp
-local_ip = 127.0.0.1
-local_port = 22
-use_encryption = true
-use_gzip = false
-remote_port = 6001
-
-[privilege_web]
-privilege_mode = true
-type = http
-local_ip = 127.0.0.1
-local_port = 80
-use_gzip = true
-custom_domains = web03.yourdomain.com
+use_encryption = false
+use_compression = false 
+custom_domains = web02.yourdomain.com
 # locations is only useful for http type
 locations = /,/pic
 host_header_rewrite = example.com
-subdomain = dev

conf/frps.ini

@@ -26,8 +26,7 @@ log_level = info
 
 log_max_days = 3
 
-# if you enable privilege mode, frpc can create a proxy without pre-configure in frps when privilege_token is correct
-privilege_mode = true
+# privilege mode is the only supported mode since v0.10.0
 privilege_token = 12345678
 
 # heartbeat configure, it's not recommended to modify the default value
@@ -38,7 +37,7 @@ privilege_token = 12345678
 privilege_allow_ports = 2000-3000,3001,3003,4000-50000
 
 # pool_count in each proxy will change to max_pool_count if they exceed the maximum value
-max_pool_count = 100
+max_pool_count = 10
 
 # authentication_timeout means the timeout interval (seconds) when the frpc connects frps
 # if authentication_timeout is zero, the time is not verified, default is 900s
@@ -47,29 +46,3 @@ authentication_timeout = 900
 # if subdomain_host is not empty, you can set subdomain when type is http or https in frpc's configure file
 # when subdomain is test, the host used by routing is test.frps.com
 subdomain_host = frps.com
-
-# ssh is the proxy name, client will use this name and auth_token to connect to server
-[ssh]
-type = tcp
-auth_token = 123
-bind_addr = 0.0.0.0
-listen_port = 6000
-
-[dns]
-type = udp
-auth_token = 123
-bind_addr = 0.0.0.0
-listen_port = 5353
-
-[web01]
-# if type equals http, vhost_http_port must be set
-type = http
-auth_token = 123
-# if proxy type equals http, custom_domains must be set separated by commas
-custom_domains = web01.yourdomain.com,web01.yourdomain2.com
-
-[web02]
-# if type equals https, vhost_https_port must be set
-type = https
-auth_token = 123
-custom_domains = web02.yourdomain.com