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

merge conflicts fixes

Browse source
This commit is contained in:
Abhishek Kondur 2023-02-07 14:28:04 +04:00
parent bd878f79c1
commit aa3820d2bf
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compose/docker-compose.yml
View file

@ -27,8 +27,6 @@ services:
MQ_PORT: "443" MQ_PORT: "443"
MQ_SERVER_PORT: "1883" MQ_SERVER_PORT: "1883"
VERBOSITY: "1" VERBOSITY: "1"
MANAGE_IPTABLES: "on"
PORT_FORWARD_SERVICES: "dns"
MQ_PASSWORD: "REPLACE_MQ_PASSWORD" MQ_PASSWORD: "REPLACE_MQ_PASSWORD"
MQ_USERNAME: "REPLACE_MQ_USERNAME" MQ_USERNAME: "REPLACE_MQ_USERNAME"
STUN_PORT: "3478" STUN_PORT: "3478"

4
controllers/hosts.go
View file

@ -97,10 +97,6 @@ func updateHost(w http.ResponseWriter, r *http.Request) {
if updateRelay { if updateRelay {
logic.UpdateHostRelay(currHost.ID.String(), currHost.RelayedHosts, newHost.RelayedHosts) logic.UpdateHostRelay(currHost.ID.String(), currHost.RelayedHosts, newHost.RelayedHosts)
} }
<<<<<<< HEAD
=======
>>>>>>> f4851937c1746475fdac99e9c562623128ba16b1
// publish host update through MQ // publish host update through MQ
if err := mq.HostUpdate(&models.HostUpdate{ if err := mq.HostUpdate(&models.HostUpdate{
Action: models.UpdateHost, Action: models.UpdateHost,