Index: head/www/caddy/Makefile =================================================================== --- head/www/caddy/Makefile (revision 469641) +++ head/www/caddy/Makefile (revision 469642) @@ -1,33 +1,38 @@ # Created by: fabian.freyer@physik.tu-berlin.de # $FreeBSD$ PORTNAME= caddy DISTVERSIONPREFIX= v -DISTVERSION= 0.10.14 +DISTVERSION= 0.11.0 CATEGORIES= www MAINTAINER= fabian.freyer@physik.tu-berlin.de COMMENT= Fast, cross-platform HTTP/2 web server with automatic HTTPS LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES= go USE_GITHUB= yes GH_ACCOUNT= mholt GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} SUB_FILES= pkg-message PLIST_FILES= bin/caddy etc/rc.d/caddy + +OPTIONS_DEFINE= TELEMETRY + +TELEMETRY_DESC= Enable telemetry support +TELEMETRY_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-disable-telemetry do-build: @cd ${GO_WRKSRC}/${PORTNAME} && ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build do-install: ${INSTALL_PROGRAM} ${GO_WRKSRC}/${PORTNAME}/${PORTNAME} \ ${STAGEDIR}/${PREFIX}/bin/${PORTNAME} ${INSTALL_SCRIPT} ${GO_WRKSRC}/dist/init/freebsd/${PORTNAME} \ ${STAGEDIR}/${PREFIX}/etc/rc.d/${PORTNAME} .include Index: head/www/caddy/distinfo =================================================================== --- head/www/caddy/distinfo (revision 469641) +++ head/www/caddy/distinfo (revision 469642) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524662204 -SHA256 (mholt-caddy-v0.10.14_GH0.tar.gz) = 13feb836e85af3525b3e95f42635566f14d171edc9776881f59fbf61fa45d345 -SIZE (mholt-caddy-v0.10.14_GH0.tar.gz) = 2910178 +TIMESTAMP = 1526046100 +SHA256 (mholt-caddy-v0.11.0_GH0.tar.gz) = 81e593d258460a9f5c6b5a5f46890a08b6b1ce15f5c0fc7bcaf09826368c3a1a +SIZE (mholt-caddy-v0.11.0_GH0.tar.gz) = 2946948 Property changes on: head/www/caddy/distinfo ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/www/caddy/files/extra-patch-disable-telemetry =================================================================== --- head/www/caddy/files/extra-patch-disable-telemetry (nonexistent) +++ head/www/caddy/files/extra-patch-disable-telemetry (revision 469642) @@ -0,0 +1,8 @@ +--- caddy/caddymain/run.go.orig 2018-05-11 13:10:27 UTC ++++ caddy/caddymain/run.go +@@ -434,4 +434,4 @@ var ( + gitFilesModified string // git diff-index --name-only HEAD + ) + +-const enableTelemetry = true ++const enableTelemetry = false Property changes on: head/www/caddy/files/extra-patch-disable-telemetry ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/caddy/files/pkg-message.in =================================================================== --- head/www/caddy/files/pkg-message.in (revision 469641) +++ head/www/caddy/files/pkg-message.in (revision 469642) @@ -1,34 +1,51 @@ ***************************************************************** www/caddy does not ship with any in-tree documentation. Online documentation can be found at https://caddyserver.com/docs. To use www/caddy, create a configuration file in the Caddyfile format in %%PREFIX%%/www/Caddyfile and enable caddy in your rc.conf: # sysrc caddy_enable="YES" # service caddy start Example Caddyfile ================= mysite.com { root %%PREFIX%%/www/mysite.com } sub.mysite.com { root %%PREFIX%%/www/sub.mysite.com gzip log /var/log/sub.mysite.com/access.log } Automatic HTTPS using letsencrypt.org ===================================== Provide an SSL certificate issuer email in your rc.conf. By providing an email address you automatically agree to letsencrypt.org's general terms and conditions: caddy_cert_email="your.email@example.org" +Telemetry +========= + +Since version 0.11.0, caddy includes an optional telemetry +client, which is disabled by this port by default. + +If the telemetry client is enabled, you can view global stats +as well as stats from your caddy instance using the instance +uuid (stored in ~/.caddy/uuid unless a different $CADDYPATH +is specified) on https://caddyserver.com/stats. + +Specific metrics can be disabled at run-time using the +-disabled-metrics flag. + +More information about the Caddy Telemetry Project can be found +at https://caddyserver.com/docs/telemetry. + *****************************************************************