frp: migrate generated configuration from INI to TOML

net/frp/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=frp
 PKG_VERSION:=0.69.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v$(PKG_VERSION)?
@@ -36,6 +36,7 @@ endef
 define Package/frp/install
 	$(INSTALL_DIR) $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/etc/config/
+	$(INSTALL_DIR) $(1)/etc/frp/$(2).d/
 	$(INSTALL_DIR) $(1)/etc/init.d/
 
 	$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/$(2) $(1)/usr/bin/
@@ -65,6 +66,7 @@ define Package/frp/template
 
   define Package/$(1)/conffiles
 /etc/config/$(1)
+/etc/frp/$(1).d/
   endef
 
   define Package/$(1)/install

net/frp/files/frpc.config

@@ -1,20 +1,64 @@
 config init
-	option stdout 1
-	option stderr 1
-	option user frpc
-	option group frpc
-	option respawn 1
+	option stdout '1'
+	option stderr '1'
+#	Uncomment to run frpc as an existing user/group. Keep disabled by
+#	default to avoid permission issues with certificate, log and included
+#	config files.
+#	option user 'nobody'
+#	option group 'nogroup'
+	option respawn '1'
 #	For full configuration options, see:
-#	https://github.com/fatedier/frp/blob/master/conf/legacy/frpc_legacy_full.ini
+#	https://github.com/fatedier/frp/blob/master/conf/frpc_full_example.toml
+#
+#	Additional config files should be readable root-level TOML fragments.
+#	The service will refuse to start if a listed fragment is missing or outside /etc/frp/frpc.d/.
+#	Use frp's own includes option or per-proxy raw settings for proxy/visitor tables.
+#	list conf_inc '/etc/frp/frpc.d/frpc_extra.toml'
 
 config conf 'common'
-	option server_addr 127.0.0.1
-	option server_port 7000
-#	List options with name="_" will be directly appended to config file
-#	list _ '# Key-A=Value-A'
+	option server_addr '127.0.0.1'
+	option server_port '7000'
+	option authentication_method 'token'
+#	option token 'your_token'
+#	Alternatively, load a token from a file or command. Exec token sources
+#	require frpc to run with --allow-unsafe=TokenSourceExec; the init script
+#	adds that flag automatically when token_source_type is exec.
+#	option token_source_type 'file'
+#	option token_source_file_path '/etc/frp/client_token'
+#	option token_source_type 'exec'
+#	option token_source_exec_command '/usr/bin/get-frpc-token'
+#	list token_source_exec_args '--format'
+#	list token_source_exec_args 'raw'
+#	list token_source_exec_env 'TOKEN_SERVICE=production'
+	option login_fail_exit 'true'
+	option protocol 'tcp'
+	option wire_protocol 'v1'
+	option tcp_mux 'true'
+	option tls_enable 'true'
+	option disable_custom_tls_first_byte 'true'
+	# Web server is disabled when admin_port is empty or 0.
+#	option admin_addr '127.0.0.1'
+#	option admin_port '7400'
+#	option admin_user 'admin'
+#	option admin_pwd 'admin'
+	option admin_tls_enable 'false'
+	option pprof_enable 'false'
+#	option admin_tls_cert_file '/etc/ssl/acme/example.com.fullchain.crt'
+#	option admin_tls_key_file '/etc/ssl/acme/example.com.key'
+	option log_file 'console'
+	option log_level 'info'
+	option log_max_days '3'
+#	Uncomment to enable runtime proxy/visitor persistence via frpc web UI or API.
+#	option store_path '/etc/frp/frpc_store.json'
+#	List options with name "_" will be directly appended as raw TOML lines.
+#	Use this only for options not covered by UCI options above.
+#	Do not duplicate keys generated by UCI options above.
+#	list _ 'uncovered.option = "value"'
 
 config conf 'ssh'
-	option type tcp
-	option local_ip 127.0.0.1
-	option local_port 22
-	option remote_port 6000
+	option name 'ssh'
+	option type 'tcp'
+	option local_ip '127.0.0.1'
+	option local_port '22'
+	option remote_port '6000'
+	option enabled 'true'