cloudflared: Add more run parameters in UCI

https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/configure-tunnels/tunnel-run-parameters/

Close #24122

Signed-off-by: Ryan Keane <the.ra2.ifv@gmail.com>
(cherry picked from commit 31c91837f9f171828ef6d4bd1e1867f4c593e2cc)
[rebased upon 23.05 branch]
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

diff --git a/net/cloudflared/Makefile b/net/cloudflared/Makefile
index f65f9eaa6ba2d9265d7ff9e23afa18abefd66cf0..10d66a2cca5f79754ac2fd09fc0ff4b807782f10 100644 (file)
--- a/net/cloudflared/Makefile
+++ b/net/cloudflared/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cloudflared
 PKG_VERSION:=2024.4.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/cloudflare/cloudflared/tar.gz/$(PKG_VERSION)?

diff --git a/net/cloudflared/files/cloudflared.config b/net/cloudflared/files/cloudflared.config
index b01abf1759632f8316246d005dda23de15a831d0..324d3ecf325967b886ad3c1d0fb91a534c2660a3 100644 (file)
--- a/net/cloudflared/files/cloudflared.config
+++ b/net/cloudflared/files/cloudflared.config
@@ -4,7 +4,10 @@ config cloudflared 'config'
        option token ''
        option config '/etc/cloudflared/config.yml'
        option origincert '/etc/cloudflared/cert.pem'
+       option edge-bind-address 'auto'
+       option protocol 'auto'
        option region ''
+       option retries '5'
        option loglevel 'info'
        option logfile '/var/log/cloudflared.log'
 

diff --git a/net/cloudflared/files/cloudflared.init b/net/cloudflared/files/cloudflared.init
index 466cb5eb3164fb7a61377420a8e73887c0cdd99a..2e511d8f56bdec4e34e0cb9eae1887f9ddb632a6 100755 (executable)
--- a/net/cloudflared/files/cloudflared.init
+++ b/net/cloudflared/files/cloudflared.init
@@ -26,7 +26,10 @@ start_service() {
 
        append_param_arg "config" "/etc/cloudflared/config.yml"
        append_param_arg "origincert" "/etc/cloudflared/cert.pem"
+       append_param_arg "edge-bind-address"
+       append_param_arg "protocol"
        append_param_arg "region"
+       append_param_arg "retries"
        append_param_arg "loglevel"
        append_param_arg "logfile"