From 8c860641b9fa48704d5fe707187968419621c85c Mon Sep 17 00:00:00 2001
From: Adam Daniels <adam@mediadrive.ca>
Date: Tue, 15 Oct 2019 17:38:20 -0400
Subject: [PATCH] dist: Update FreeBSD Init script to support custom flags
 (#2796)

Clear rc_flags in start precmd. If these flags are still present during
start command, they are passed to daemon(8) instead of caddy(8).

Extract all options into $caddy_options environment variable.
---
 dist/init/freebsd/caddy | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dist/init/freebsd/caddy b/dist/init/freebsd/caddy
index 9d18791b..a2af50b5 100755
--- a/dist/init/freebsd/caddy
+++ b/dist/init/freebsd/caddy
@@ -58,6 +58,8 @@ load_rc_config ${name}
 : ${caddy_syslog_level="notice"}
 : ${caddy_user="root"}
 : ${caddy_group="wheel"}
+: ${caddy_flags=""}
+: ${caddy_options="-cpu ${caddy_cpu} -log stdout -conf ${caddy_config_path} -agree -email ${caddy_cert_email} ${caddy_flags}"}
 
 if [ "$caddy_cert_email" = "" ]
 then
@@ -68,12 +70,15 @@ fi
 pidfile="/var/run/${name}.pid"
 procname="${caddy_bin_path}" #enabled builtin pid checking for start / stop
 command="/usr/sbin/daemon"
-command_args="-p ${pidfile} -T ${name} -l ${caddy_syslog_facility} -s ${caddy_syslog_level} /usr/bin/env ${caddy_env} ${procname} -cpu ${caddy_cpu} -log stdout -conf ${caddy_config_path} -agree -email ${caddy_cert_email} < /dev/null"
+command_args="-p ${pidfile} -T ${name} -l ${caddy_syslog_facility} -s ${caddy_syslog_level} /usr/bin/env ${caddy_env} ${procname} ${caddy_options} < /dev/null"
 
 start_precmd="caddy_startprecmd"
 
 caddy_startprecmd()
 {
+	# Clear flags provided by caddy_flags to prevent them being passed to daemon(8)
+	rc_flags=""
+
 	if [ ! -e "${pidfile}" ]; then
 		install -o "${caddy_user}" -g "${caddy_group}" "/dev/null" "${pidfile}"
 	fi