diff --git a/MOVED b/MOVED index 6446b415827b..cdd8ad4702fe 100644 --- a/MOVED +++ b/MOVED @@ -16286,3 +16286,4 @@ security/netpgp||2021-04-12|Broken 12+, unmaintained upstream net/freenet6||2021-04-12|Broken 12+, service discontinued devel/sd-mux|devel/sd-mux-ctrl|2021-04-13|Renamed to match upstream naming sysutils/sd-mux-ctrl|devel/sd-mux-ctrl|2021-04-13|Remove duplicate port +net/traefik2|net/traefik|2021-04-28|Superseded by net/traefik update diff --git a/net/Makefile b/net/Makefile index a073b43a676a..921be7b31657 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1472,7 +1472,6 @@ SUBDIR += toonel SUBDIR += torsocks SUBDIR += traefik - SUBDIR += traefik2 SUBDIR += traff SUBDIR += trafshow SUBDIR += trafshow3 diff --git a/net/traefik2/Makefile b/net/traefik2/Makefile deleted file mode 100644 index c13bf6ec3715..000000000000 --- a/net/traefik2/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -PORTNAME= traefik2 -DISTVERSIONPREFIX= v -DISTVERSION= 2.2.0 -DISTVERSIONSUFFIX= -vendor -CATEGORIES= net - -MAINTAINER= freebsd@funzi.org -COMMENT= High availability reverse proxy and load balancer - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE.md - -USES= go:modules - -USE_GITHUB= yes -GH_ACCOUNT= Funzinator -GH_PROJECT= traefik -GH_SUBDIR= src/github.com/containous/traefik - -USE_RC_SUBR= traefik - -GO_BUILDFLAGS= -ldflags "-s -w \ - -X github.com/containous/traefik/v2/pkg/version.Version=${DISTVERSION} \ - -X github.com/containous/traefik/v2/pkg/version.Codename=chevrotin \ - -X github.com/containous/traefik/v2/pkg/version.BuildDate=`date -u '+%Y-%m-%d_%I:%M:%S%p'`" -GO_TARGET= ./cmd/traefik -CGO_ENABLED= 0 - -USERS= traefik -GROUPS= traefik - -PLIST_FILES= bin/traefik \ - "@sample etc/traefik.toml.sample" - -post-patch: - # Install a sample configuration file which works by default - # without manual tweaking - ${REINPLACE_CMD} -e 's|:80|:8088|' -e 's|:443|:8443|' \ - -e 's|\[docker|# \[docker|' ${WRKSRC}/traefik.sample.toml - -post-install: - ${INSTALL_DATA} ${WRKSRC}/traefik.sample.toml ${STAGEDIR}${PREFIX}/etc/traefik.toml.sample - -.include diff --git a/net/traefik2/distinfo b/net/traefik2/distinfo deleted file mode 100644 index ff69752e0d7f..000000000000 --- a/net/traefik2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1586190057 -SHA256 (Funzinator-traefik-v2.2.0-vendor_GH0.tar.gz) = ae01a3d771a41944850c242f756a7edc6124969cbdc2d217039581514a085611 -SIZE (Funzinator-traefik-v2.2.0-vendor_GH0.tar.gz) = 20733835 diff --git a/net/traefik2/files/traefik.in b/net/traefik2/files/traefik.in deleted file mode 100644 index 1e574b54dbd2..000000000000 --- a/net/traefik2/files/traefik.in +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -# PROVIDE: traefik -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# traefik_enable (bool): Set to NO by default. -# Set it to YES to enable traefik. -# traefik_user (user): Set user to run traefik. -# Default is "traefik". -# traefik_group (group): Set group to run traefik. -# Default is "traefik". -# traefik_conf (path): Path to traefik configuration file. -# Default is %%PREFIX%%/etc/traefik.toml -# traefik_env (vars): Set environment variables used with traefik -# Default is "". -# These are necessary for ACME (Let's Encrypt) -# configuration, see -# https://docs.traefik.io/configuration/acme/ - -. /etc/rc.subr - -name=traefik -rcvar=traefik_enable - -load_rc_config $name - -: ${traefik_enable:="NO"} -: ${traefik_user:="traefik"} -: ${traefik_group:="traefik"} -: ${traefik_conf:="%%PREFIX%%/etc/traefik.toml"} -: ${traefik_env:=""} - -pidfile=/var/run/traefik.pid -procname="%%PREFIX%%/bin/traefik" -command="/usr/sbin/daemon" -command_args="-f -p ${pidfile} /usr/bin/env ${traefik_env} ${procname} --configFile=${traefik_conf} ${traefik_args}" - -start_precmd=traefik_startprecmd - -traefik_startprecmd() -{ - if [ ! -e ${pidfile} ]; then - install -o ${traefik_user} -g ${traefik_group} /dev/null ${pidfile}; - fi -} - -run_rc_command "$1" diff --git a/net/traefik2/pkg-descr b/net/traefik2/pkg-descr deleted file mode 100644 index 5987f7269bfa..000000000000 --- a/net/traefik2/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Traefik (pronounced like traffic) is a modern HTTP reverse proxy and load -balancer made to deploy microservices with ease. It supports several backends -(Docker, Swarm mode, Kubernetes, Marathon, Consul, Etcd, Rancher, Amazon ECS, -and a lot more) to manage its configuration automatically and dynamically. - -WWW: https://traefik.io/ diff --git a/net/traefik2/pkg-message b/net/traefik2/pkg-message deleted file mode 100644 index 5fb39fbf0f4a..000000000000 --- a/net/traefik2/pkg-message +++ /dev/null @@ -1,21 +0,0 @@ -[ -{ type: install - message: <