diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 83371183..1448c4cb 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -31,6 +31,7 @@ body: label: Version description: What version are you running? options: + - v0.14.0 - v0.13.1 - v0.13.0 - v0.12.2 diff --git a/README.md b/README.md index fdd2669c..8fb85480 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ a platform for modern, blazing fast virtual networks

- + @@ -43,7 +43,7 @@ a platform for modern, blazing fast virtual networks **For production-grade installations, visit the [Install Docs](https://netmaker.readthedocs.io/en/master/install.html).** **For an HA install using helm on k8s, visit the [Helm Repo](https://github.com/gravitl/netmaker-helm/).** 1. Get a cloud VM with Ubuntu 20.04 and a public IP. -2. Open ports 443, 80, 53, and 51821-51830/udp on the VM firewall and in cloud security settings. +2. Open ports 443, 80, 53, 8883, and 51821-51830/udp on the VM firewall and in cloud security settings. 3. Run the script **(see below for optional configurations)**: `wget -qO - https://raw.githubusercontent.com/gravitl/netmaker/master/scripts/nm-quick.sh | sudo bash` diff --git a/compose/docker-compose.contained.yml b/compose/docker-compose.contained.yml index f0972eaf..60c7d32f 100644 --- a/compose/docker-compose.contained.yml +++ b/compose/docker-compose.contained.yml @@ -3,7 +3,7 @@ version: "3.4" services: netmaker: container_name: netmaker - image: gravitl/netmaker:v0.13.1 + image: gravitl/netmaker:v0.14.0 volumes: - dnsconfig:/root/config/dnsconfig - sqldata:/root/data @@ -43,7 +43,7 @@ services: container_name: netmaker-ui depends_on: - netmaker - image: gravitl/netmaker-ui:v0.13.1 + image: gravitl/netmaker-ui:v0.14.0 links: - "netmaker:api" environment: diff --git a/compose/docker-compose.nocaddy.yml b/compose/docker-compose.nocaddy.yml index e68a97d4..d4ce1e11 100644 --- a/compose/docker-compose.nocaddy.yml +++ b/compose/docker-compose.nocaddy.yml @@ -3,7 +3,7 @@ version: "3.4" services: netmaker: container_name: netmaker - image: gravitl/netmaker:v0.13.1 + image: gravitl/netmaker:v0.14.0 volumes: - dnsconfig:/root/config/dnsconfig - sqldata:/root/data @@ -44,7 +44,7 @@ services: container_name: netmaker-ui depends_on: - netmaker - image: gravitl/netmaker-ui:v0.13.1 + image: gravitl/netmaker-ui:v0.14.0 links: - "netmaker:api" ports: diff --git a/compose/docker-compose.nodns.yml b/compose/docker-compose.nodns.yml index 4ec9906b..265ee4be 100644 --- a/compose/docker-compose.nodns.yml +++ b/compose/docker-compose.nodns.yml @@ -3,7 +3,7 @@ version: "3.4" services: netmaker: container_name: netmaker - image: gravitl/netmaker:v0.13.1 + image: gravitl/netmaker:v0.14.0 volumes: - dnsconfig:/root/config/dnsconfig - sqldata:/root/data diff --git a/compose/docker-compose.reference.yml b/compose/docker-compose.reference.yml index 0d18f2e4..9b895b50 100644 --- a/compose/docker-compose.reference.yml +++ b/compose/docker-compose.reference.yml @@ -2,7 +2,7 @@ services: netmaker: # The Primary Server for running Netmaker privileged: true # Necessary to run sudo/root level commands on host system. Likely using this if running with host networking on. container_name: netmaker - image: gravitl/netmaker:v0.13.1 + image: gravitl/netmaker:v0.14.0 volumes: # Volume mounts necessary for CLIENT_MODE to control wireguard networking on host (except dnsconfig, which is where dns config files are stored for use by CoreDNS) - dnsconfig:/root/config/dnsconfig # Netmaker writes Corefile to this location, which gets mounted by CoreDNS for DNS configuration. - sqldata:/root/data @@ -46,7 +46,7 @@ services: container_name: netmaker-ui depends_on: - netmaker - image: gravitl/netmaker-ui:v0.13.1 + image: gravitl/netmaker-ui:v0.14.0 links: - "netmaker:api" ports: diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index d4422c04..1cc17f90 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.4" services: netmaker: container_name: netmaker - image: gravitl/netmaker:v0.13.1 + image: gravitl/netmaker:v0.14.0 volumes: - dnsconfig:/root/config/dnsconfig - sqldata:/root/data @@ -44,7 +44,7 @@ services: container_name: netmaker-ui depends_on: - netmaker - image: gravitl/netmaker-ui:v0.13.1 + image: gravitl/netmaker-ui:v0.14.0 links: - "netmaker:api" ports: diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh index 329be8c0..c53a4e07 100755 --- a/scripts/nm-quick.sh +++ b/scripts/nm-quick.sh @@ -174,36 +174,31 @@ echo "visit dashboard.$NETMAKER_BASE_DOMAIN to log in" sleep 2 setup_mesh() { -echo "creating default network (10.101.0.0/16)" +echo "creating netmaker network (10.101.0.0/16)" -curl -s -o /dev/null -d '{"addressrange":"10.101.0.0/16","netid":"default"}' -H "Authorization: Bearer $MASTER_KEY" -H 'Content-Type: application/json' https://api.${NETMAKER_BASE_DOMAIN}/api/networks +curl -s -o /dev/null -d '{"addressrange":"10.101.0.0/16","netid":"netmaker"}' -H "Authorization: Bearer $MASTER_KEY" -H 'Content-Type: application/json' https://api.${NETMAKER_BASE_DOMAIN}/api/networks sleep 2 -echo "creating default key" +echo "creating netmaker access key" -curlresponse=$(curl -s -d '{"uses":99999,"name":"defaultkey"}' -H "Authorization: Bearer $MASTER_KEY" -H 'Content-Type: application/json' https://api.${NETMAKER_BASE_DOMAIN}/api/networks/default/keys) +curlresponse=$(curl -s -d '{"uses":99999,"name":"netmaker-key"}' -H "Authorization: Bearer $MASTER_KEY" -H 'Content-Type: application/json' https://api.${NETMAKER_BASE_DOMAIN}/api/networks/netmaker/keys) ACCESS_TOKEN=$(jq -r '.accessstring' <<< ${curlresponse}) sleep 2 echo "configuring netmaker server as ingress gateway" -curlresponse=$(curl -s -H "Authorization: Bearer $MASTER_KEY" -H 'Content-Type: application/json' https://api.${NETMAKER_BASE_DOMAIN}/api/nodes/default) +curlresponse=$(curl -s -H "Authorization: Bearer $MASTER_KEY" -H 'Content-Type: application/json' https://api.${NETMAKER_BASE_DOMAIN}/api/nodes/netmaker) SERVER_ID=$(jq -r '.[0].id' <<< ${curlresponse}) -curl -o /dev/null -s -X POST -H "Authorization: Bearer $MASTER_KEY" -H 'Content-Type: application/json' https://api.${NETMAKER_BASE_DOMAIN}/api/nodes/default/$SERVER_ID/createingress +curl -o /dev/null -s -X POST -H "Authorization: Bearer $MASTER_KEY" -H 'Content-Type: application/json' https://api.${NETMAKER_BASE_DOMAIN}/api/nodes/netmaker/$SERVER_ID/createingress echo "finished configuring server and network. You can now add clients." echo "" -echo "For Linux and Mac clients, install with the following command:" -echo " curl -sfL https://raw.githubusercontent.com/gravitl/netmaker/master/scripts/netclient-install.sh | sudo KEY=$ACCESS_TOKEN sh -" -echo "" -echo "For Windows clients, perform the following from powershell, as administrator:" -echo " 1. Make sure WireGuardNT is installed - https://download.wireguard.com/windows-client/wireguard-installer.exe" -echo " 2. Download netclient.exe - wget https://github.com/gravitl/netmaker/releases/download/latest/netclient.exe" -echo " 3. Install Netclient - powershell.exe .\\netclient.exe join -t $ACCESS_TOKEN" -echo " 4. Whitelist C:\ProgramData\Netclient in Windows Defender" +echo "For Linux, Mac, Windows, and FreeBSD:" +echo " 1. Install the netclient: https://docs.netmaker.org/netclient.html#installation" +echo " 2. Join the network: netclient join -t $ACCESS_TOKEN" echo "" echo "For Android and iOS clients, perform the following steps:" echo " 1. Log into UI at dashboard.$NETMAKER_BASE_DOMAIN"