Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 May 2018 14:45:35 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r469642 - in head/www/caddy: . files
Message-ID:  <201805111445.w4BEjZCJ070619@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Fri May 11 14:45:34 2018
New Revision: 469642
URL: https://svnweb.freebsd.org/changeset/ports/469642

Log:
  www/caddy: Update to 0.11.0
  
  PR:		228158
  Submitted by:	Fabian Freyer <fabian.freyer@physik.tu-berlin.de> (maintainer)

Added:
  head/www/caddy/files/extra-patch-disable-telemetry   (contents, props changed)
Modified:
  head/www/caddy/Makefile   (contents, props changed)
  head/www/caddy/distinfo   (contents, props changed)
  head/www/caddy/files/pkg-message.in   (contents, props changed)

Modified: head/www/caddy/Makefile
==============================================================================
--- head/www/caddy/Makefile	Fri May 11 13:54:39 2018	(r469641)
+++ head/www/caddy/Makefile	Fri May 11 14:45:34 2018	(r469642)
@@ -3,7 +3,7 @@
 
 PORTNAME=	caddy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.10.14
+DISTVERSION=	0.11.0
 CATEGORIES=	www
 
 MAINTAINER=	fabian.freyer@physik.tu-berlin.de
@@ -20,6 +20,11 @@ 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

Modified: head/www/caddy/distinfo
==============================================================================
--- head/www/caddy/distinfo	Fri May 11 13:54:39 2018	(r469641)
+++ head/www/caddy/distinfo	Fri May 11 14:45:34 2018	(r469642)
@@ -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

Added: head/www/caddy/files/extra-patch-disable-telemetry
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/caddy/files/extra-patch-disable-telemetry	Fri May 11 14:45:34 2018	(r469642)
@@ -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

Modified: head/www/caddy/files/pkg-message.in
==============================================================================
--- head/www/caddy/files/pkg-message.in	Fri May 11 13:54:39 2018	(r469641)
+++ head/www/caddy/files/pkg-message.in	Fri May 11 14:45:34 2018	(r469642)
@@ -31,4 +31,21 @@ 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.
+
 *****************************************************************



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805111445.w4BEjZCJ070619>