diff --git a/www/caddy/Makefile b/www/caddy/Makefile index 14629b7b0cbf..b2b10dce42cb 100644 --- a/www/caddy/Makefile +++ b/www/caddy/Makefile @@ -1,36 +1,38 @@ PORTNAME= caddy DISTVERSIONPREFIX= v DISTVERSION= 2.6.1 PORTREVISION= 2 CATEGORIES= www DIST_SUBDIR= caddy MAINTAINER= adamw@FreeBSD.org COMMENT= Fast, cross-platform HTTP/2 web server with automatic HTTPS WWW= https://caddyserver.com LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe go:modules CPE_VENDOR= caddyserver USE_RC_SUBR= caddy SUB_FILES= Caddyfile.sample caddy pkg-message +CONFLICTS_INSTALL= xcaddy + PLIST_FILES= bin/${PORTNAME} \ "@sample ${ETCDIR_REL}/Caddyfile.sample" GO_BUILDFLAGS+= -ldflags='-X github.com/caddyserver/caddy/v2.VersionString=${DISTVERSIONFULL}' GO_TARGET= ./cmd/caddy # If go.mod is sufficient: GO_MODULE= github.com/caddyserver/caddy/v2 # If modules must be specified manually: #.include "${.CURDIR}/modules.mk" post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/Caddyfile.sample ${STAGEDIR}${ETCDIR} .include diff --git a/www/xcaddy/Makefile b/www/xcaddy/Makefile index 899a586b7f7a..3bc889dbe9db 100644 --- a/www/xcaddy/Makefile +++ b/www/xcaddy/Makefile @@ -1,26 +1,32 @@ PORTNAME= xcaddy DISTVERSIONPREFIX= v DISTVERSION= 0.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www DIST_SUBDIR= xcaddy MAINTAINER= olgeni@FreeBSD.org COMMENT= Command line tool to make custom builds of the Caddy Web Server WWW= https://github.com/caddyserver/xcaddy LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules +USE_RC_SUBR= caddy +SUB_FILES= caddy +SUB_LIST+= CADDYDIR="${PREFIX}/etc/caddy" + +CONFLICTS_INSTALL= caddy + USE_GITHUB= yes GH_ACCOUNT= caddyserver GH_TUPLE= Masterminds:semver:v3.1.1:masterminds_semver_v3/vendor/github.com/Masterminds/semver/v3 \ google:shlex:e7afc7fbc510:google_shlex/vendor/github.com/google/shlex GO_TARGET= ./cmd/xcaddy PLIST_FILES= bin/${PORTNAME} .include diff --git a/www/xcaddy/files/caddy.in b/www/xcaddy/files/caddy.in new file mode 100644 index 000000000000..e1b137b37380 --- /dev/null +++ b/www/xcaddy/files/caddy.in @@ -0,0 +1,127 @@ +#!/bin/sh + +# PROVIDE: caddy +# REQUIRE: LOGIN DAEMON NETWORKING +# KEYWORD: shutdown + +# To enable caddy, add 'caddy_enable="YES"' to /etc/rc.conf or +# /etc/rc.conf.local + +# Optional settings: +# caddy_command (string): Full path to the caddy binary +# caddy_config (string): Full path to caddy config file +# (%%PREFIX%%/etc/caddy/Caddyfile) +# caddy_adapter (string): Config adapter type (caddyfile) +# caddy_directory (string): Root for caddy storage (ACME certs, etc.) +# (/var/db/caddy) +# caddy_extra_flags (string): Extra flags passed to caddy start +# caddy_logdir (string): Where caddy logs are stored +# (/var/log/caddy) +# caddy_logfile (string): Location of process log (${caddy_logdir}/caddy.log) +# This is for startup/shutdown/error messages. +# To create an access log, see: +# https://caddyserver.com/docs/caddyfile/directives/log +# caddy_user (user): User to run caddy (root) +# caddy_group (group): Group to run caddy (wheel) +# +# This script will honor XDG_CONFIG_HOME/XDG_DATA_HOME. Caddy will create a +# .../caddy subdir in each of those. By default, they are subdirs of /var/db/caddy. +# See https://caddyserver.com/docs/conventions#data-directory + +. /etc/rc.subr + +name=caddy +rcvar=caddy_enable +desc="Powerful, enterprise-ready, open source web server with automatic HTTPS written in Go" + +load_rc_config $name + +# Defaults +: ${caddy_enable:=NO} +: ${caddy_adapter:=caddyfile} +: ${caddy_config:="%%PREFIX%%/etc/caddy/Caddyfile"} +: ${caddy_command:="%%PREFIX%%/bin/${name}"} +: ${caddy_directory:=/var/db/caddy} +: ${caddy_extra_flags:=""} +: ${caddy_logdir:="/var/log/${name}"} +: ${caddy_logfile:="${caddy_logdir}/${name}.log"} +: ${caddy_user:="root"} +: ${caddy_group:="wheel"} + +# Config and base directories +: ${XDG_CONFIG_HOME:="${caddy_directory}/config"} +: ${XDG_DATA_HOME:="${caddy_directory}/data"} +export XDG_CONFIG_HOME XDG_DATA_HOME + +caddy_flags="--config ${caddy_config} --adapter ${caddy_adapter}" +pidfile="/var/run/${name}/${name}.pid" + +required_files="${caddy_config} ${caddy_command}" + +start_precmd="caddy_precmd" +start_cmd="caddy_start" +stop_precmd="caddy_prestop" + +# Extra Commands +extra_commands="configtest reload" +configtest_cmd="caddy_execute validate ${caddy_flags}" +reload_cmd="caddy_execute reload ${caddy_flags}" + +caddy_execute() +{ + /usr/bin/su -m "${caddy_user}" -c "${caddy_command} $*" +} + +caddy_precmd() +{ + # Create required directories and set permissions + /usr/bin/install -d -m 755 -o "${caddy_user}" -g "${caddy_group}" ${caddy_directory} + /usr/bin/install -d -m 700 -o "${caddy_user}" -g "${caddy_group}" ${caddy_directory}/config + /usr/bin/install -d -m 700 -o "${caddy_user}" -g "${caddy_group}" ${caddy_directory}/data + /usr/bin/install -d -m 755 -o "${caddy_user}" -g "${caddy_group}" ${caddy_logdir} + /usr/bin/install -d -m 700 -o "${caddy_user}" -g "${caddy_group}" /var/run/caddy + if [ -e ${caddy_logfile} ]; then + /bin/chmod 644 ${caddy_logfile} + /usr/sbin/chown root:wheel ${caddy_logfile} + else + /usr/bin/install -m 644 -o root -g wheel /dev/null ${caddy_logfile} + fi +} + +caddy_start() +{ + echo -n "Starting caddy... " + /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" + echo "Log: ${caddy_logfile}" + else + echo "Error: Caddy failed to start" + echo "Check the caddy log: ${caddy_logfile}" + fi +} + +caddy_prestop() +{ + local result + + echo -n "Stopping caddy... " + + result="$(caddy_execute stop 2>&1)" + if [ ${?} -eq 0 ]; then + echo "done" + exit 0 + else + if echo "${result}" | grep -q "connection refused"; then + echo "admin interface unavailable; using pidfile" + return 0 + else + echo "Error: Unable to stop caddy" + echo "Check the caddy log: ${caddy_logfile}" + return 1 + fi + fi +} + +run_rc_command "$1"