git: 3490a531954e - main - net/cloudflared: update 2021.3.5 to 2021.4.0, and fix rc script

[Vinícius Zavam]

The branch main has been updated by egypcio:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3490a531954e1746ee3ce97d5a75e4cef298a214

commit 3490a531954e1746ee3ce97d5a75e4cef298a214
Author:     Vinícius Zavam <egypcio at FreeBSD.org>
AuthorDate: 2021-04-12 21:22:13 +0000
Commit:     Vinícius Zavam <egypcio at FreeBSD.org>
CommitDate: 2021-04-12 21:27:58 +0000

    net/cloudflared: update 2021.3.5 to 2021.4.0, and fix rc script
    
            - add notes about tunnel modes
            - default mode starts a free tunnel, using trycloudflare.com
    
    PR:             254854
    Reported by:    ale@
---
 net/cloudflared/Makefile             |  2 +-
 net/cloudflared/distinfo             |  6 +++---
 net/cloudflared/files/cloudflared.in | 10 ++++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/net/cloudflared/Makefile b/net/cloudflared/Makefile
index 23ee2146d8d4..44f09c115df2 100644
--- a/net/cloudflared/Makefile
+++ b/net/cloudflared/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cloudflared
-DISTVERSION=	2021.3.5
+DISTVERSION=	2021.4.0
 CATEGORIES=	net www
 
 MAINTAINER=	egypcio at FreeBSD.org
diff --git a/net/cloudflared/distinfo b/net/cloudflared/distinfo
index 91794f38bddd..585830e41266 100644
--- a/net/cloudflared/distinfo
+++ b/net/cloudflared/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616836174
-SHA256 (cloudflare-cloudflared-2021.3.5_GH0.tar.gz) = 1521846ee97e066ca18ec4cefed1a84b634b57d989c76d186086fff19b4746d4
-SIZE (cloudflare-cloudflared-2021.3.5_GH0.tar.gz) = 7471623
+TIMESTAMP = 1618260846
+SHA256 (cloudflare-cloudflared-2021.4.0_GH0.tar.gz) = d3d395f1cdabcd7421c647bf4c9f64dc799206c5d9042f797d65e5356f84f99d
+SIZE (cloudflare-cloudflared-2021.4.0_GH0.tar.gz) = 7471792
diff --git a/net/cloudflared/files/cloudflared.in b/net/cloudflared/files/cloudflared.in
index d54cd1d55846..45ceb4e384f5 100644
--- a/net/cloudflared/files/cloudflared.in
+++ b/net/cloudflared/files/cloudflared.in
@@ -11,14 +11,16 @@
 # cloudflared_conf (str)	Config file to use
 #				Default: %%ETCDIR%%/config.yml
 #
-# cloudflared_mode (str)	Mode to run cloudflared as (tunnel, or proxy-dns)
-#				Default: tunnel
+# cloudflared_mode (str)	Mode to run cloudflared as (e.g. 'tunnel', 'tunnel run'
+#				or 'proxy-dns'). Should you use the default, a free
+#				tunnel is set up for you.
+#				Default: "tunnel"
 
 . /etc/rc.subr
 
 name="cloudflared"
 rcvar="cloudflared_enable"
-logfile="/var/log/cloudflared/cloudflared.log"
+logfile="/var/log/cloudflared.log"
 pidfile="/var/run/cloudflared.pid"
 procname="%%PREFIX%%/bin/cloudflared"
 
@@ -29,6 +31,6 @@ load_rc_config $name
 : ${cloudflared_mode:="tunnel"}
 
 command="/usr/sbin/daemon"
-command_args="-o ${logfile} -p ${pidfile} -f ${procname} --cred-file ${cloudflared_conf} ${cloudflared_mode}"
+command_args="-o ${logfile} -p ${pidfile} -f ${procname} --config ${cloudflared_conf} ${cloudflared_mode}"
 
 run_rc_command "$1"