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

Release v0.30.0 #3276

Merged
merged 6 commits into from
Dec 28, 2024
Merged

Release v0.30.0 #3276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
27088a3
add all proto to default user policies
abhishek9686 Dec 20, 2024
629f6d3
Merge pull request #3273 from gravitl/NET-1784-release
abhishek9686 Dec 20, 2024
7a6ce59
handle ip check gracefully
abhishek9686 Dec 28, 2024
081efde
only use tcp on caddy
abhishek9686 Dec 28, 2024
64ae917
remove deprecated stun servers
abhishek9686 Dec 28, 2024
271c3f2
Merge pull request #3275 from gravitl/NET-1784-script
abhishek9686 Dec 28, 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
10 changes: 5 additions & 5 deletions compose/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
- sqldata:/root/data
environment:
# config-dependant vars
- STUN_SERVERS=stun1.netmaker.io:3478,stun2.netmaker.io:3478,stun1.l.google.com:19302,stun2.l.google.com:19302
- STUN_SERVERS=stun1.l.google.com:19302,stun2.l.google.com:19302,stun3.l.google.com:19302,stun4.l.google.com:19302
# The domain/host IP indicating the mq broker address
- BROKER_ENDPOINT=wss://broker.${NM_DOMAIN} # For EMQX broker use `BROKER_ENDPOINT=wss://broker.${NM_DOMAIN}/mqtt`
# For EMQX broker (uncomment the two lines below)
Expand Down Expand Up @@ -52,11 +52,11 @@ services:
- caddy_data:/data
- caddy_conf:/config
ports:
- "$SERVER_HOST:80:80"
- "$SERVER_HOST:443:443"
- "$SERVER_HOST:80:80/tcp"
- "$SERVER_HOST:443:443/tcp"
#uncomment to enable IPv6 communication
# - "$SERVER_HOST6:80:80"
# - "$SERVER_HOST6:443:443"
# - "$SERVER_HOST6:80:80/tcp"
# - "$SERVER_HOST6:443:443/tcp"

coredns:
#network_mode: host
Expand Down
2 changes: 2 additions & 0 deletions pro/logic/user_mgmt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,6 +1213,7 @@ func CreateDefaultUserPolicies(netID models.NetworkID) {
Default: true,
ServiceType: models.Any,
NetworkID: netID,
Proto: models.ALL,
RuleType: models.UserPolicy,
Src: []models.AclPolicyTag{
{
Expand Down Expand Up @@ -1245,6 +1246,7 @@ func CreateDefaultUserPolicies(netID models.NetworkID) {
Default: true,
ServiceType: models.Any,
NetworkID: netID,
Proto: models.ALL,
RuleType: models.UserPolicy,
Src: []models.AclPolicyTag{
{
Expand Down
4 changes: 2 additions & 2 deletions scripts/nm-quick.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,8 +509,8 @@ set -e
# set_install_vars - sets the variables that will be used throughout installation
set_install_vars() {

IP_ADDR=$(curl -s -4 ifconfig.me)
IP6_ADDR=$(curl -s -6 ifconfig.me)
IP_ADDR=$(curl -s -4 ifconfig.me || echo "")
IP6_ADDR=$(curl -s -6 ifconfig.me || echo "")
if [ "$NETMAKER_BASE_DOMAIN" = "" ]; then
NETMAKER_BASE_DOMAIN=nm.$(echo $IP_ADDR | tr . -).nip.io
fi
Expand Down
Loading