gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2026-03-23 06:38:21 +08:00
Code Issues Projects Releases Packages Wiki Activity

remove default value on dns domain

Browse source
This commit is contained in:
abhishek9686 2024-12-18 23:07:37 +04:00
parent 20038716ea
commit 715ed23553
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
controllers/dns.go
View file

@ -164,7 +164,8 @@ func createDNS(w http.ResponseWriter, r *http.Request) {
return
}
// check if default domain is appended if not append
if !strings.HasSuffix(entry.Name, servercfg.GetDefaultDomain()) {
if servercfg.GetDefaultDomain() != "" &&
!strings.HasSuffix(entry.Name, servercfg.GetDefaultDomain()) {
entry.Name += "." + servercfg.GetDefaultDomain()
}
entry, err = logic.CreateDNS(entry)

6
logic/dns.go
View file

@ -116,7 +116,11 @@ func GetNodeDNS(network string) ([]models.DNSEntry, error) {
continue
}
var entry = models.DNSEntry{}
entry.Name = fmt.Sprintf("%s.%s.%s", host.Name, network, defaultDomain)
if defaultDomain == "" {
entry.Name = fmt.Sprintf("%s.%s", host.Name, network)
} else {
entry.Name = fmt.Sprintf("%s.%s.%s", host.Name, network, defaultDomain)
}
entry.Network = network
if node.Address.IP != nil {
entry.Address = node.Address.IP.String()

7
servercfg/serverconf.go
View file

@ -12,7 +12,6 @@ import (
"github.com/gravitl/netmaker/config"
"github.com/gravitl/netmaker/models"
"golang.org/x/exp/slog"
)
// EmqxBrokerType denotes the broker type for EMQX MQTT
@ -684,13 +683,11 @@ func IsOldAclEnabled() bool {
// GetDefaultDomain - get the default domain
func GetDefaultDomain() string {
//default netmaker.hosted
domain := "hosted.nm"
//default hosted.nm
var domain string
if os.Getenv("DEFAULT_DOMAIN") != "" {
if validateDomain(os.Getenv("DEFAULT_DOMAIN")) {
domain = os.Getenv("DEFAULT_DOMAIN")
} else {
slog.Warn("invalid value, set to default domain: netmaker.hosted", "warn", os.Getenv("DEFAULT_DOMAIN"))
}
}
return domain