gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-07 05:34:38 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1322 from gravitl/refactor_v0.14.5_remove_mq_srv_port

Browse source 
Refactor v0.14.5 remove mq srv port
This commit is contained in:
Alex Feiszli 2022-07-07 10:33:59 -04:00 • committed by GitHub
commit 4e112b321f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 19 additions and 35 deletions
Show stats 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
description: What version are you running?
options:
- v0.14.5
- v0.14.4
- v0.14.3
- v0.14.2

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

@ -3,7 +3,7 @@ version: "3.4"
services:
netmaker:
container_name: netmaker
image: gravitl/netmaker:v0.14.4
image: gravitl/netmaker:v0.14.5
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.14.4
image: gravitl/netmaker-ui:v0.14.5
links:
- "netmaker:api"
environment:

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

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

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

@ -3,7 +3,7 @@ version: "3.4"
services:
netmaker:
container_name: netmaker
image: gravitl/netmaker:v0.14.4
image: gravitl/netmaker:v0.14.5
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.14.4
image: gravitl/netmaker-ui:v0.14.5
links:
- "netmaker:api"
ports:

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

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

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

@ -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.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)
- 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.14.4
image: gravitl/netmaker-ui:v0.14.5
links:
- "netmaker:api"
ports:

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

@ -3,7 +3,7 @@ version: "3.4"
services:
netmaker:
container_name: netmaker
image: gravitl/netmaker:v0.14.4
image: gravitl/netmaker:v0.14.5
cap_add:
- NET_ADMIN
- NET_RAW
@ -51,7 +51,7 @@ services:
- traefik.http.services.netmaker-api.loadbalancer.server.port=8081
netmaker-ui:
container_name: netmaker-ui
image: gravitl/netmaker-ui:v0.14.4
image: gravitl/netmaker-ui:v0.14.5
depends_on:
- netmaker
links:
@ -114,11 +114,6 @@ services:
- mosquitto_data:/mosquitto/data
- mosquitto_logs:/mosquitto/log
- 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:
- "8883"
labels:

4
compose/docker-compose.yml
View file

@ -3,7 +3,7 @@ version: "3.4"
services:
netmaker:
container_name: netmaker
image: gravitl/netmaker:v0.14.4
image: gravitl/netmaker:v0.14.5
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.14.4
image: gravitl/netmaker-ui:v0.14.5
links:
- "netmaker:api"
environment:

1
config/config.go
View file

@ -67,7 +67,6 @@ type ServerConfig struct {
PortForwardServices string `yaml:"portforwardservices"`
HostNetwork string `yaml:"hostnetwork"`
MQPort string `yaml:"mqport"`
MQServerPort string `yaml:"mqserverport"`
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"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
version="0.14.4.0"
version="0.14.5.0"
processorArchitecture="*"
name="netclient.exe"
type="win32"

2
netclient/versioninfo.json
View file

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

13
servercfg/serverconf.go
View file

@ -221,17 +221,6 @@ func GetMQPort() string {
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
func GetMessageQueueEndpoint() string {
host, _ := GetPublicIP()
@ -240,7 +229,7 @@ func GetMessageQueueEndpoint() string {
} else if config.Config.Server.MQHOST != "" {
host = config.Config.Server.MQHOST
}
return host + ":" + GetMQServerPort()
return host + ":" + GetMQPort()
}
// 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 {
switch service {
case "mq":
err = iptablesPortForward("mq", servercfg.GetMQServerPort(), servercfg.GetMQServerPort(), false, force)
err = iptablesPortForward("mq", servercfg.GetMQPort(), servercfg.GetMQPort(), false, force)
case "dns":
err = iptablesPortForward("coredns", "53", "53", false, force)
case "ssh":