Try to fix consul middleware provider

2024-07-17 16:32:26 +02:00 · 2024-07-17 16:29:38 +02:00 · 2024-07-17 16:26:31 +02:00 · 2024-07-17 16:23:56 +02:00 · 2024-07-17 16:20:02 +02:00 · 2024-07-17 16:11:14 +02:00
1 changed files with 9 additions and 9 deletions
--- a/consul/discovery.go
+++ b/consul/discovery.go
@@ -74,7 +74,7 @@ func (s *Service) Register() error {
 		ID: s.GetID(),
 		// Kind:    consul.ServiceKindConnectProxy,
 		Name:    s.Name,
-		Address: s.domain,
+		Address: s.Address,
 		Port:    s.port,
 		Tags:    s.getTags(),
 		// Connect: &consul.AgentServiceConnect{Native: true},
@@ -178,22 +178,22 @@ func (s *Service) healthCheck() (bool, error) {
 func (s *Service) getTags() []string {
 	tags := []string{
 		"traefik.enable=true",
+		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authRequestHeaders=Cookie",
+		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authResponseHeaders=Set-Cookie, Server",
+		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.trustForwardHeader=true",
+		"traefik.http.middlewares.auth_" + s.Name + ".plugin.auth.handlerURL=" + config.GetEnv("AUTH_HANDLER_URL", ""),
+		"traefik.http.middlewares.requestid_" + s.Name + ".plugin.requestid.headerName=X-Request-ID",
+		"traefik.http.middlewares.stripprefix_" + s.Name + ".stripprefix.prefixes=" + s.pathPrefix,
 		"traefik.http.routers." + s.Name + ".rule=PathPrefix(`" + s.pathPrefix + "`)",
 		// "traefik.http.routers." + s.Name + ".rule=Host(`" + s.domain + "`)",
 		"traefik.http.routers." + s.Name + ".entryPoints=https",
 		// "traefik.http.routers." + s.Name + ".tls=true",
 		"traefik.http.routers." + s.Name + ".service=" + s.Name,
-		"traefik.http.routers." + s.Name + ".middlewares=stripprefix_" + s.Name,
-		// "traefik.http.routers." + s.Name + ".middlewares=auth_" + s.Name + ",requestid_" + s.Name + ",stripprefix_" + s.Name,
+		// "traefik.http.routers." + s.Name + ".middlewares=auth_" + s.Name + ",stripprefix_" + s.Name,
+		"traefik.http.routers." + s.Name + ".middlewares=auth_" + s.Name + "@consulcatalog,requestid_" + s.Name + "@consulcatalog,stripprefix_" + s.Name + "@consulcatalog",
 		"traefik.http.services." + s.Name + ".loadbalancer.server.scheme=http",
 		"traefik.http.services." + s.Name + ".loadbalancer.server.port=" + strconv.Itoa(s.port),
 		"traefik.http.services." + s.Name + ".loadbalancer.passhostheader=false",
-		"traefik.http.middlewares.auth_" + s.Name + ".plugin.auth.handlerURL=" + config.GetEnv("AUTH_HANDLER_URL", ""),
-		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authRequestHeaders=Cookie",
-		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authResponseHeaders=Set-Cookie, Server",
-		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.trustForwardHeader=true",
-		// "traefik.http.middlewares.requestid_" + s.Name + ".plugin.requestid.headerName=X-Request-ID",
-		"traefik.http.middlewares.stripprefix_" + s.Name + ".stripprefix.prefixes=" + s.pathPrefix,
 		"traefik.tls.certificates.certfile=/certs/client.cert",
 		"traefik.tls.certificates.keyfile=/certs/client.key",
 	}
Author	SHA1	Message	Date
Piotr Biernat	0f8eda40ad	Try to fix consul middleware provider	2024-07-17 16:32:26 +02:00
Piotr Biernat	3285ee65da	Try to fix consul middleware provider	2024-07-17 16:29:38 +02:00
Piotr Biernat	47339bda36	Try to fix consul middleware provider	2024-07-17 16:26:31 +02:00
Piotr Biernat	33269f9726	Try to fix consul middleware provider	2024-07-17 16:23:56 +02:00
Piotr Biernat	5b5a8318a4	Fixed consul tags ordering	2024-07-17 16:20:02 +02:00
Piotr Biernat	42b3a44364	Fixed consul tags ordering	2024-07-17 16:11:14 +02:00
Piotr Biernat	20278f24b3	Fixed consul registered middlewares	2024-07-17 16:07:20 +02:00
Piotr Biernat	ae49c9cdb8	Fixed consul registered middlewares	2024-07-17 16:03:46 +02:00
Piotr Biernat	ea08da8d10	Fixed consul registered address	2024-07-17 15:34:55 +02:00
Piotr Biernat	0aa6fc2aa3	Fixed consul registered tags	2024-07-17 15:22:30 +02:00
Piotr Biernat	ab6189e855	Fixed consul registered address	2024-07-17 15:14:20 +02:00
Piotr Biernat	1c244db6ea	Fixed consul registered address	2024-07-17 15:09:37 +02:00
Piotr Biernat	3394040a8c	Fixed consul registered address	2024-07-17 15:07:09 +02:00
Piotr Biernat	bc439fd4d2	revert consul router rules	2024-07-16 22:23:12 +02:00
Piotr Biernat	16cfa5fead	fix consul router rules	2024-07-16 22:17:51 +02:00