Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Sep 6, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91bbd74
upgrade Caddy to v2.8.4
yabinma Sep 3, 2024
2197fed
add BATCH_PEER_UPDATE in netmaker.env with default values
yabinma Sep 3, 2024
8387b6c
add comment for emqx for caddy upgrade change
yabinma Sep 4, 2024
49627da
Merge branch 'develop' into NET-1534
yabinma Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compose/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions docker/Caddyfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
}
8 changes: 6 additions & 2 deletions docker/Caddyfile-pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
4 changes: 4 additions & 0 deletions scripts/netmaker.default.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,8 @@ EMAIL_SENDER_ADDR=
EMAIL_SENDER_USER=
# sender smtp password
EMAIL_SENDER_PASSWORD=
# if batch peer update enable or not
PEER_UPDATE_BATCH=true
# batch peer update size when PEER_UPDATE_BATCH is enabled
PEER_UPDATE_BATCH_SIZE=50
abhishek9686 marked this conversation as resolved.
Show resolved Hide resolved

Loading