svn commit: r553180 - in head/net/traefik: . files

[Thomas Zander]

Author: riggs
Date: Sat Oct 24 10:50:25 2020
New Revision: 553180
URL: https://svnweb.freebsd.org/changeset/ports/553180

Log:
  Update to upstream release 2.3.2
  
  Details:
  - Bug- and doc fixes, see:
    https://github.com/traefik/traefik/releases/tag/v2.3.2
  - Update port note for maintainers (vendoring for traefik).
  - Ship example yml config as well for users who prefer
    yaml over toml.

Added:
  head/net/traefik/files/patch-traefik.sample.toml   (contents, props changed)
  head/net/traefik/files/patch-traefik.sample.yml   (contents, props changed)
Modified:
  head/net/traefik/Makefile
  head/net/traefik/distinfo

Modified: head/net/traefik/Makefile
==============================================================================
--- head/net/traefik/Makefile	Sat Oct 24 10:43:07 2020	(r553179)
+++ head/net/traefik/Makefile	Sat Oct 24 10:50:25 2020	(r553180)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	traefik
-PORTVERSION=	2.3.1
+PORTVERSION=	2.3.2
 CATEGORIES=	net
 MASTER_SITES=	LOCAL/riggs/${PORTNAME}
 
@@ -28,23 +28,19 @@ USERS=		traefik
 GROUPS=		traefik
 
 PLIST_FILES=	bin/traefik \
-		"@sample etc/traefik.toml.sample"
+		"@sample etc/traefik.toml.sample" \
+		"@sample etc/traefik.yml.sample"
 
 # Preparing the vendor dir for a self-contained tarball now works by just
-# executing 'make gomod-vendor' and bundling the resulting ${WRKSRC}/vendor.
+# running 'go mod vendor' as a user and bundling the resulting
+# ${WRKSRC}/vendor directory.
 # Building the UI with node + yarn is no longer necessary.
 
-post-patch:
-	# Install a sample configuration file which at least allows the daemon
-	# to start without manual tweaking.
-	${REINPLACE_CMD} -e 's|:80|:8088|' \
-			 -e 's|:443|:8433|' \
-			 -e 's|\[providers.docker|# \[providers.docker|' ${WRKSRC}/traefik.sample.toml
-
 pre-build:
 	cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} generate
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/traefik.sample.toml ${STAGEDIR}${PREFIX}/etc/traefik.toml.sample
+	${INSTALL_DATA} ${WRKSRC}/traefik.sample.yml ${STAGEDIR}${PREFIX}/etc/traefik.yml.sample
 
 .include <bsd.port.mk>

Modified: head/net/traefik/distinfo
==============================================================================
--- head/net/traefik/distinfo	Sat Oct 24 10:43:07 2020	(r553179)
+++ head/net/traefik/distinfo	Sat Oct 24 10:50:25 2020	(r553180)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602282919
-SHA256 (traefik-2.3.1.tar.xz) = 4c270456282773e234057d8a7959856d7a61eac930a5f159cb4f7ea19dabcab6
-SIZE (traefik-2.3.1.tar.xz) = 13105328
+TIMESTAMP = 1603469984
+SHA256 (traefik-2.3.2.tar.xz) = 99a8fb607113e80cd317d4dd693601e35a910b60ec6cacbb6451241da53720b8
+SIZE (traefik-2.3.2.tar.xz) = 14088976

Added: head/net/traefik/files/patch-traefik.sample.toml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/traefik/files/patch-traefik.sample.toml	Sat Oct 24 10:50:25 2020	(r553180)
@@ -0,0 +1,24 @@
+--- traefik.sample.toml.orig	2020-10-19 18:27:54 UTC
++++ traefik.sample.toml
+@@ -23,10 +23,10 @@
+ # Default:
+ [entryPoints]
+   [entryPoints.web]
+-    address = ":80"
++    address = ":8088"
+ 
+   [entryPoints.websecure]
+-    address = ":443"
++    address = ":8443"
+ 
+ ################################################################
+ # Traefik logs configuration
+@@ -100,7 +100,7 @@
+   # Optional
+   # Default: false
+   #
+-  # insecure = true
++  insecure = true
+ 
+   # Enabled Dashboard
+   #

Added: head/net/traefik/files/patch-traefik.sample.yml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/traefik/files/patch-traefik.sample.yml	Sat Oct 24 10:50:25 2020	(r553180)
@@ -0,0 +1,31 @@
+--- traefik.sample.yml.orig	2020-10-19 18:27:54 UTC
++++ traefik.sample.yml
+@@ -23,10 +23,10 @@ global:
+ #
+ entryPoints:
+   web:
+-    address: :80
++    address: :8088
+ 
+   websecure:
+-    address: :443
++    address: :8443
+ 
+ ################################################################
+ # Traefik logs configuration
+@@ -94,13 +94,13 @@ entryPoints:
+ #
+ # Optional
+ #
+-#api:
++api:
+   # Enable the API in insecure mode
+   #
+   # Optional
+   # Default: false
+   #
+-#  insecure: true
++  insecure: true
+ 
+   # Enabled Dashboard
+   #