Pārlūkot izejas kodu

NET-1534:upgrade Caddy to v2.8.4 (#3097)

* upgrade Caddy to v2.8.4

* add BATCH_PEER_UPDATE in netmaker.env with default values

* add comment for emqx for caddy upgrade change
Max Ma 1 gadu atpakaļ
vecāks
revīzija
db4cf1d1fd
3 mainītis faili ar 13 papildinājumiem un 5 dzēšanām
  1. 1 1
      compose/docker-compose.yml
  2. 6 2
      docker/Caddyfile
  3. 6 2
      docker/Caddyfile-pro

+ 1 - 1
compose/docker-compose.yml

@@ -41,7 +41,7 @@ services:
     restart: always
 
   caddy:
-    image: caddy:2.6.2
+    image: caddy:2.8.4
     container_name: caddy
     env_file: ./netmaker.env
     restart: unless-stopped

+ 6 - 2
docker/Caddyfile

@@ -25,6 +25,10 @@ https://api.{$NM_DOMAIN} {
 }
 
 # MQ
-wss://broker.{$NM_DOMAIN} {
-	reverse_proxy ws://mq:8883 # For EMQX websockets use `reverse_proxy ws://mq:8083`
+broker.{$NM_DOMAIN} {
+	@ws {
+			header Connection *Upgrade*
+			header Upgrade websocket
+		}
+	reverse_proxy @ws mq:8883   # For EMQX websockets use `reverse_proxy @ws mq:8083`
 }

+ 6 - 2
docker/Caddyfile-pro

@@ -40,6 +40,10 @@ https://api.{$NM_DOMAIN} {
 }
 
 # MQ
-wss://broker.{$NM_DOMAIN} {
-	reverse_proxy ws://mq:8883
+broker.{$NM_DOMAIN} {
+	@ws {
+			header Connection *Upgrade*
+			header Upgrade websocket
+		}
+	reverse_proxy @ws mq:8883
 }