zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-31 04:06:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

added v0.14.5 and removed MQ_SERVER_PORT

Browse Source
This commit is contained in:
0xdcarns
2022-07-06 10:06:39 -04:00
parent 6cbffd1348
commit 3a74170ab2
13 changed files with 19 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/ISSUE_TEMPLATE/bug-report.yml vendored
View File

@@ -31,6 +31,7 @@ body:
label: Version label: Version
description: What version are you running? description: What version are you running?
options: options:
- v0.14.5
- v0.14.4 - v0.14.4
- v0.14.3 - v0.14.3
- v0.14.2 - v0.14.2

4
compose/docker-compose.contained.yml
View File

@@ -3,7 +3,7 @@ version: "3.4"
services: services:
netmaker: netmaker:
container_name: netmaker container_name: netmaker
image: gravitl/netmaker:v0.14.4 image: gravitl/netmaker:v0.14.5
volumes: volumes:
- dnsconfig:/root/config/dnsconfig - dnsconfig:/root/config/dnsconfig
- sqldata:/root/data - sqldata:/root/data
@@ -43,7 +43,7 @@ services:
container_name: netmaker-ui container_name: netmaker-ui
depends_on: depends_on:
- netmaker - netmaker
image: gravitl/netmaker-ui:v0.14.4 image: gravitl/netmaker-ui:v0.14.5
links: links:
- "netmaker:api" - "netmaker:api"
environment: environment:

4
compose/docker-compose.hostnetwork.yml
View File

@@ -3,7 +3,7 @@ version: "3.4"
services: services:
netmaker: netmaker:
container_name: netmaker container_name: netmaker
image: gravitl/netmaker:v0.14.4 image: gravitl/netmaker:v0.14.5
volumes: volumes:
- dnsconfig:/root/config/dnsconfig - dnsconfig:/root/config/dnsconfig
- /usr/bin/wg:/usr/bin/wg - /usr/bin/wg:/usr/bin/wg
@@ -38,7 +38,7 @@ services:
container_name: netmaker-ui container_name: netmaker-ui
depends_on: depends_on:
- netmaker - netmaker
image: gravitl/netmaker-ui:v0.14.4 image: gravitl/netmaker-ui:v0.14.5
links: links:
- "netmaker:api" - "netmaker:api"
ports: ports:

4
compose/docker-compose.nocaddy.yml
View File

@@ -3,7 +3,7 @@ version: "3.4"
services: services:
netmaker: netmaker:
container_name: netmaker container_name: netmaker
image: gravitl/netmaker:v0.14.4 image: gravitl/netmaker:v0.14.5
volumes: volumes:
- dnsconfig:/root/config/dnsconfig - dnsconfig:/root/config/dnsconfig
- sqldata:/root/data - sqldata:/root/data
@@ -44,7 +44,7 @@ services:
container_name: netmaker-ui container_name: netmaker-ui
depends_on: depends_on:
- netmaker - netmaker
image: gravitl/netmaker-ui:v0.14.4 image: gravitl/netmaker-ui:v0.14.5
links: links:
- "netmaker:api" - "netmaker:api"
ports: ports:

4
compose/docker-compose.nodns.yml
View File

@@ -3,7 +3,7 @@ version: "3.4"
services: services:
netmaker: netmaker:
container_name: netmaker container_name: netmaker
image: gravitl/netmaker:v0.14.4 image: gravitl/netmaker:v0.14.5
volumes: volumes:
- dnsconfig:/root/config/dnsconfig - dnsconfig:/root/config/dnsconfig
- sqldata:/root/data - sqldata:/root/data
@@ -45,7 +45,7 @@ services:
container_name: netmaker-ui container_name: netmaker-ui
depends_on: depends_on:
- netmaker - netmaker
image: gravitl/netmaker-ui:v0.14.4 image: gravitl/netmaker-ui:v0.14.5
links: links:
- "netmaker:api" - "netmaker:api"
ports: ports:

4
compose/docker-compose.reference.yml
View File

@@ -2,7 +2,7 @@ services:
netmaker: # The Primary Server for running Netmaker 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. privileged: true # Necessary to run sudo/root level commands on host system. Likely using this if running with host networking on.
container_name: netmaker container_name: netmaker
image: gravitl/netmaker:v0.14.4 image: gravitl/netmaker:v0.14.5
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) 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. - dnsconfig:/root/config/dnsconfig # Netmaker writes Corefile to this location, which gets mounted by CoreDNS for DNS configuration.
- sqldata:/root/data - sqldata:/root/data
@@ -46,7 +46,7 @@ services:
container_name: netmaker-ui container_name: netmaker-ui
depends_on: depends_on:
- netmaker - netmaker
image: gravitl/netmaker-ui:v0.14.4 image: gravitl/netmaker-ui:v0.14.5
links: links:
- "netmaker:api" - "netmaker:api"
ports: ports:

9
compose/docker-compose.traefik.yml
View File

@@ -3,7 +3,7 @@ version: "3.4"
services: services:
netmaker: netmaker:
container_name: netmaker container_name: netmaker
image: gravitl/netmaker:v0.14.4 image: gravitl/netmaker:v0.14.5
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
- NET_RAW - NET_RAW
@@ -51,7 +51,7 @@ services:
- traefik.http.services.netmaker-api.loadbalancer.server.port=8081 - traefik.http.services.netmaker-api.loadbalancer.server.port=8081
netmaker-ui: netmaker-ui:
container_name: netmaker-ui container_name: netmaker-ui
image: gravitl/netmaker-ui:v0.14.4 image: gravitl/netmaker-ui:v0.14.5
depends_on: depends_on:
- netmaker - netmaker
links: links:
@@ -114,11 +114,6 @@ services:
- mosquitto_data:/mosquitto/data - mosquitto_data:/mosquitto/data
- mosquitto_logs:/mosquitto/log - mosquitto_logs:/mosquitto/log
- shared_certs:/mosquitto/certs - shared_certs:/mosquitto/certs
ports:
- "127.0.0.1:1883:1883"
# comment once netmaker supports changing MQ port
# - "8883:8883"
# uncomment once netmaker supports changing MQ port
expose: expose:
- "8883" - "8883"
labels: labels:

4
compose/docker-compose.yml
View File

@@ -3,7 +3,7 @@ version: "3.4"
services: services:
netmaker: netmaker:
container_name: netmaker container_name: netmaker
image: gravitl/netmaker:v0.14.4 image: gravitl/netmaker:v0.14.5
volumes: volumes:
- dnsconfig:/root/config/dnsconfig - dnsconfig:/root/config/dnsconfig
- sqldata:/root/data - sqldata:/root/data
@@ -43,7 +43,7 @@ services:
container_name: netmaker-ui container_name: netmaker-ui
depends_on: depends_on:
- netmaker - netmaker
image: gravitl/netmaker-ui:v0.14.4 image: gravitl/netmaker-ui:v0.14.5
links: links:
- "netmaker:api" - "netmaker:api"
environment: environment:

1
config/config.go
View File

@@ -67,7 +67,6 @@ type ServerConfig struct {
PortForwardServices string `yaml:"portforwardservices"` PortForwardServices string `yaml:"portforwardservices"`
HostNetwork string `yaml:"hostnetwork"` HostNetwork string `yaml:"hostnetwork"`
MQPort string `yaml:"mqport"` MQPort string `yaml:"mqport"`
MQServerPort string `yaml:"mqserverport"`
Server string `yaml:"server"` Server string `yaml:"server"`
} }

2
netclient/netclient.exe.manifest.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity <assemblyIdentity
version="0.14.4.0" version="0.14.5.0"
processorArchitecture="*" processorArchitecture="*"
name="netclient.exe" name="netclient.exe"
type="win32" type="win32"

2
netclient/versioninfo.json
View File

@@ -29,7 +29,7 @@
"OriginalFilename": "", "OriginalFilename": "",
"PrivateBuild": "", "PrivateBuild": "",
"ProductName": "Netclient", "ProductName": "Netclient",
"ProductVersion": "v0.14.4.0", "ProductVersion": "v0.14.5.0",
"SpecialBuild": "" "SpecialBuild": ""
}, },
"VarFileInfo": { "VarFileInfo": {

13
servercfg/serverconf.go
View File

@@ -221,17 +221,6 @@ func GetMQPort() string {
return port return port
} }
// GetMQServerPort - get mq port for server
func GetMQServerPort() string {
port := "1883" //default
if os.Getenv("MQ_SERVER_PORT") != "" {
port = os.Getenv("MQ_SERVER_PORT")
} else if config.Config.Server.MQServerPort != "" {
port = config.Config.Server.MQServerPort
}
return port
}
// GetMessageQueueEndpoint - gets the message queue endpoint // GetMessageQueueEndpoint - gets the message queue endpoint
func GetMessageQueueEndpoint() string { func GetMessageQueueEndpoint() string {
host, _ := GetPublicIP() host, _ := GetPublicIP()
@@ -240,7 +229,7 @@ func GetMessageQueueEndpoint() string {
} else if config.Config.Server.MQHOST != "" { } else if config.Config.Server.MQHOST != "" {
host = config.Config.Server.MQHOST host = config.Config.Server.MQHOST
} }
return host + ":" + GetMQServerPort() return host + ":" + GetMQPort()
} }
// GetMasterKey - gets the configured master key of server // GetMasterKey - gets the configured master key of server

2
serverctl/iptables.go
View File

@@ -46,7 +46,7 @@ func portForwardServices(force bool) error {
for _, service := range services { for _, service := range services {
switch service { switch service {
case "mq": case "mq":
err = iptablesPortForward("mq", servercfg.GetMQServerPort(), servercfg.GetMQServerPort(), false, force) err = iptablesPortForward("mq", servercfg.GetMQPort(), servercfg.GetMQPort(), false, force)
case "dns": case "dns":
err = iptablesPortForward("coredns", "53", "53", false, force) err = iptablesPortForward("coredns", "53", "53", false, force)
case "ssh": case "ssh":