Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-10-31 10:37:24 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

freebsd init: added new functionality and enabled better logging (#1740)

Browse Source 
* uses more of the builtin functionality for starting and stopping of the process by using command and command_args along with procname
* removed -f from daemon as this was hiding error message that were sent to stdout on startup, now writing stdout to the logfile directly

for example, this was being hidden:

“Activating privacy features.. [www.domain.com] failed to get certificate: Error presenting token: Could not find the start of authority”

it now shows up in the log

* aded “caddy_env” to allow the setting of environment variables that caddy might need, for example when setting creds for “DNS Challenge”

* added a check to ensure caddy_config_path file exists
This commit is contained in:
Richard Bowden 2017-07-10 23:20:30 +01:00 committed by Matt Holt
parent acc67eb3b2
commit 25a596a98f
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
dist/init/freebsd/caddy vendored
View File

@ -23,22 +23,35 @@
# caddy_config_path (str): Set to "/usr/local/www/Caddyfile" by default. # caddy_config_path (str): Set to "/usr/local/www/Caddyfile" by default.
# Defines the path for the configuration file caddy will load on boot # Defines the path for the configuration file caddy will load on boot
# #
# caddy_run_user (str): Set to "root" by default. # caddy_user (str): Set to "root" by default.
# Defines the user that caddy will run on # Defines the user that caddy will run on
# #
# caddy_group (str): Set to "wheel" by default.
# Defines the group that caddy files will be attached to
#
# caddy_logfile (str) Set to "/var/log/caddy.log" by default.
# Defines where the process log file is written, this is not a web access log
#
# caddy_env (str) Set to "" by default.
# This allows environment variable to be set that may be required, for example when using "DNS Challenge" account credentials are required.
# e.g. (in your rc.conf) caddy_env="CLOUDFLARE_EMAIL=me@domain.com CLOUDFLARE_API_KEY=my_api_key"
#
. /etc/rc.subr . /etc/rc.subr
name="caddy" name="caddy"
rcvar="${name}_enable" rcvar="${name}_enable"
load_rc_config $name load_rc_config ${name}
: ${caddy_enable:=no}
: ${caddy_enable:="NO"}
: ${caddy_cert_email=""} : ${caddy_cert_email=""}
: ${caddy_bin_path="/usr/local/bin/caddy"} : ${caddy_bin_path="/usr/local/bin/caddy"}
: ${caddy_cpu="99%"} # was a bug for me that caused a crash within jails : ${caddy_cpu="99%"} # was a bug for me that caused a crash within jails
: ${caddy_config_path="/usr/local/www/Caddyfile"} : ${caddy_config_path="/usr/local/www/Caddyfile"}
: ${caddy_run_user="root"} : ${caddy_logfile="/var/log/caddy.log"}
: ${caddy_user="root"}
: ${caddy_group="wheel"}
if [ "$caddy_cert_email" = "" ] if [ "$caddy_cert_email" = "" ]
then then
@ -46,38 +59,25 @@ then
exit 1 exit 1
fi fi
pidfile="/var/run/caddy.pid" pidfile="/var/run/${name}.pid"
logfile="/var/log/caddy.log" procname="${caddy_bin_path}" #enabled builtin pid checking for start / stop
command="/usr/sbin/daemon"
command_args="-u ${caddy_user} -p ${pidfile} /usr/bin/env ${caddy_env} ${procname} -cpu ${caddy_cpu} -log stdout -conf ${caddy_config_path} -agree -email ${caddy_cert_email} < /dev/null >> ${caddy_logfile} 2>&1"
command="${caddy_bin_path} -log ${logfile} -cpu ${caddy_cpu} -conf ${caddy_config_path} -agree -email ${caddy_cert_email}" start_precmd="caddy_startprecmd"
start_cmd="caddy_start" caddy_startprecmd()
status_cmd="caddy_status" {
stop_cmd="caddy_stop" if [ ! -e "${pidfile}" ]; then
install -o "${caddy_user}" -g "${caddy_group}" "/dev/null" "${pidfile}"
fi
caddy_start() { if [ ! -e "${caddy_logfile}" ]; then
echo "Starting ${name}..." install -o "${caddy_user}" -g "${caddy_group}" "dev/null" "${caddy_logfile}"
/usr/sbin/daemon -u ${caddy_run_user} -c -p ${pidfile} -f ${command}
}
caddy_status() {
if [ -f ${pidfile} ]; then
echo "${name} is running as $(cat $pidfile)."
else
echo "${name} is not running."
return 1
fi fi
} }
caddy_stop() { required_files="${caddy_config_path}"
if [ ! -f ${pidfile} ]; then
echo "${name} is not running."
return 1
fi
echo -n "Stopping ${name}..."
kill -KILL $(cat $pidfile) 2> /dev/null && echo "stopped"
rm -f ${pidfile}
}
run_rc_command "$1" run_rc_command "$1"