homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge current v2.11 into v3.1

Browse source
This commit is contained in:
mmatur 2024-07-22 09:34:51 +02:00
commit c5a6b49330
No known key found for this signature in database
GPG key ID: 2FFE42FC256CFF8E
9 changed files with 71 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/traefik/logger.go
View file

@ -7,12 +7,12 @@ import (
"strings"
"time"
"github.com/natefinch/lumberjack"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/sirupsen/logrus"
"github.com/traefik/traefik/v3/pkg/config/static"
"github.com/traefik/traefik/v3/pkg/logs"
"gopkg.in/natefinch/lumberjack.v2"
)
func init() {

2
cmd/traefik/traefik.go
View file

@ -15,7 +15,7 @@ import (
"syscall"
"time"
"github.com/coreos/go-systemd/daemon"
"github.com/coreos/go-systemd/v22/daemon"
"github.com/go-acme/lego/v4/challenge"
gokitmetrics "github.com/go-kit/kit/metrics"
"github.com/rs/zerolog/log"