Browse Source

don't bind coredns to publicip

abhishek9686 1 year ago
parent
commit
f00e45251f
3 changed files with 7 additions and 19 deletions
  1. 1 0
      compose/docker-compose.yml
  2. 4 11
      functions/local.go
  3. 2 8
      logic/dns.go

+ 1 - 0
compose/docker-compose.yml

@@ -61,6 +61,7 @@ services:
     image: coredns/coredns:1.10.1
     image: coredns/coredns:1.10.1
     command: -conf /root/dnsconfig/Corefile
     command: -conf /root/dnsconfig/Corefile
     env_file: ./netmaker.env
     env_file: ./netmaker.env
+    restart: always
     depends_on:
     depends_on:
       - netmaker
       - netmaker
     volumes:
     volumes:

+ 4 - 11
functions/local.go

@@ -26,23 +26,16 @@ func SetDNSDir() error {
 		return err
 		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 {
 	if err != nil {
 		logger.Log(0, "couldnt find or create /config/dnsconfig")
 		logger.Log(0, "couldnt find or create /config/dnsconfig")
 		return err
 		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")
 	_, err = os.Stat(dir + "/config/dnsconfig/netmaker.hosts")
 	if os.IsNotExist(err) {
 	if os.IsNotExist(err) {
 		_, err = os.Create(dir + "/config/dnsconfig/netmaker.hosts")
 		_, err = os.Create(dir + "/config/dnsconfig/netmaker.hosts")

+ 2 - 8
logic/dns.go

@@ -11,7 +11,6 @@ import (
 	"github.com/gravitl/netmaker/database"
 	"github.com/gravitl/netmaker/database"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/models"
 	"github.com/gravitl/netmaker/models"
-	"github.com/gravitl/netmaker/servercfg"
 	"github.com/txn2/txeh"
 	"github.com/txn2/txeh"
 )
 )
 
 
@@ -159,17 +158,13 @@ func SetCorefile(domains string) error {
 		return err
 		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 {
 	if err != nil {
 		logger.Log(0, "couldnt find or create /config/dnsconfig")
 		logger.Log(0, "couldnt find or create /config/dnsconfig")
 		return err
 		return err
 	}
 	}
 
 
 	corefile := domains + ` {
 	corefile := domains + ` {
-	bind %s
     reload 15s
     reload 15s
     hosts /root/dnsconfig/netmaker.hosts {
     hosts /root/dnsconfig/netmaker.hosts {
 	fallthrough	
 	fallthrough	
@@ -178,8 +173,7 @@ func SetCorefile(domains string) error {
     log
     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 {
 	if err != nil {
 		return err
 		return err
 	}
 	}