serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-27 06:03:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

dist: Update FreeBSD Init script to support custom flags (#2796)

Browse source 
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.
This commit is contained in:
Adam Daniels 2019-10-15 17:38:20 -04:00 committed by Matt Holt
parent 99914d2204
commit 8c860641b9
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dist/init/freebsd/caddy vendored
View file

@ -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