kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

www/caddy: Allow setting the path to the caddy binary

Browse source 
This will make the rc(8) script more usable for users who build
caddy with xcaddy (www/xcaddy).
This commit is contained in:
Adam Weinberger 2022-09-29 09:00:43 -06:00
parent 48b3430d64
commit 91e5f354f5
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/caddy/Makefile
View file

@ -1,7 +1,7 @@
PORTNAME= caddy
DISTVERSIONPREFIX= v
DISTVERSION= 2.6.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
DIST_SUBDIR= caddy

19
www/caddy/files/caddy.in
View file

@ -8,6 +8,7 @@
# /etc/rc.conf.local
# Optional settings:
# caddy_command (string): Full path to the caddy binary
# caddy_config (string): Full path to caddy config file
# (%%ETCDIR%%/Caddyfile)
# caddy_adapter (string): Config adapter type (caddyfile)
@ -38,7 +39,8 @@ load_rc_config $name
# Defaults
: ${caddy_enable:=NO}
: ${caddy_adapter:=caddyfile}
: ${caddy_config:=%%ETCDIR%%/Caddyfile}
: ${caddy_config:="%%ETCDIR%%/Caddyfile"}
: ${caddy_command:="%%PREFIX%%/bin/${name}"}
: ${caddy_directory:=/var/db/caddy}
: ${caddy_extra_flags:=""}
: ${caddy_logdir:="/var/log/${name}"}
@ -51,11 +53,10 @@ load_rc_config $name
: ${XDG_DATA_HOME:="${caddy_directory}/data"}
export XDG_CONFIG_HOME XDG_DATA_HOME
command="%%PREFIX%%/bin/${name}"
caddy_flags="--config ${caddy_config} --adapter ${caddy_adapter}"
pidfile="/var/run/${name}/${name}.pid"
required_files="${caddy_config} ${command}"
required_files="${caddy_config} ${caddy_command}"
start_precmd="caddy_precmd"
start_cmd="caddy_start"
@ -63,12 +64,12 @@ stop_precmd="caddy_prestop"
# Extra Commands
extra_commands="configtest reload"
configtest_cmd="caddy_command validate ${caddy_flags}"
reload_cmd="caddy_command reload ${caddy_flags}"
configtest_cmd="caddy_execute validate ${caddy_flags}"
reload_cmd="caddy_execute reload ${caddy_flags}"
caddy_command()
caddy_execute()
{
/usr/bin/su -m "${caddy_user}" -c "${command} $*"
/usr/bin/su -m "${caddy_user}" -c "${caddy_command} $*"
}
caddy_precmd()
@ -90,7 +91,7 @@ caddy_precmd()
caddy_start()
{
echo -n "Starting caddy... "
/usr/bin/su -m ${caddy_user} -c "${command} start ${caddy_flags} \
/usr/bin/su -m ${caddy_user} -c "${caddy_command} start ${caddy_flags} \
${caddy_extra_flags} --pidfile ${pidfile}" >> ${caddy_logfile} 2>&1
if [ $? -eq 0 ] && ps -ax -o pid | grep -q "$(cat ${pidfile})"; then
echo "done"
@ -107,7 +108,7 @@ caddy_prestop()
echo -n "Stopping caddy... "
result="$(caddy_command stop 2>&1)"
result="$(caddy_execute stop 2>&1)"
if [ ${?} -eq 0 ]; then
echo "done"
exit 0