diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index b7cc16e1..3111f1f5 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -61,6 +61,7 @@ services: image: coredns/coredns:1.10.1 command: -conf /root/dnsconfig/Corefile env_file: ./netmaker.env + restart: always depends_on: - netmaker volumes: diff --git a/functions/local.go b/functions/local.go index 0436a25b..a65bcd34 100644 --- a/functions/local.go +++ b/functions/local.go @@ -26,23 +26,16 @@ func SetDNSDir() error { return err } - _, err = os.Stat(dir + "/config/dnsconfig") - if os.IsNotExist(err) { - err = os.MkdirAll(dir+"/config/dnsconfig", 0744) - } + err = os.MkdirAll(dir+"/config/dnsconfig", 0744) if err != nil { logger.Log(0, "couldnt find or create /config/dnsconfig") return err } - _, err = os.Stat(dir + "/config/dnsconfig/Corefile") - if os.IsNotExist(err) { - err = logic.SetCorefile(".") - if err != nil { - logger.Log(0, err.Error()) - } + err = logic.SetCorefile(".") + if err != nil { + logger.Log(0, err.Error()) } - _, err = os.Stat(dir + "/config/dnsconfig/netmaker.hosts") if os.IsNotExist(err) { _, err = os.Create(dir + "/config/dnsconfig/netmaker.hosts") diff --git a/logic/dns.go b/logic/dns.go index 314cf770..dd3450a2 100644 --- a/logic/dns.go +++ b/logic/dns.go @@ -11,7 +11,6 @@ import ( "github.com/gravitl/netmaker/database" "github.com/gravitl/netmaker/logger" "github.com/gravitl/netmaker/models" - "github.com/gravitl/netmaker/servercfg" "github.com/txn2/txeh" ) @@ -159,17 +158,13 @@ func SetCorefile(domains string) error { return err } - _, err = os.Stat(dir + "/config/dnsconfig") - if os.IsNotExist(err) { - err = os.MkdirAll(dir+"/config/dnsconfig", 0744) - } + err = os.MkdirAll(dir+"/config/dnsconfig", 0744) if err != nil { logger.Log(0, "couldnt find or create /config/dnsconfig") return err } corefile := domains + ` { - bind %s reload 15s hosts /root/dnsconfig/netmaker.hosts { fallthrough @@ -178,8 +173,7 @@ func SetCorefile(domains string) error { log } ` - corebytes := []byte(fmt.Sprintf(corefile, servercfg.GetCoreDNSAddr())) - err = os.WriteFile(dir+"/config/dnsconfig/Corefile", corebytes, 0644) + err = os.WriteFile(dir+"/config/dnsconfig/Corefile", []byte(corefile), 0644) if err != nil { return err }