Browse Source

Merge pull request #651 from zc2638/fix/dns-dir

fix create dnsconfig dir
dcarns 3 years ago
parent
commit
a50755fb0e
2 changed files with 10 additions and 4 deletions
  1. 6 2
      functions/local.go
  2. 4 2
      logic/dns.go

+ 6 - 2
functions/local.go

@@ -22,13 +22,16 @@ func SetDNSDir() error {
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
+
 	_, err = os.Stat(dir + "/config/dnsconfig")
 	_, err = os.Stat(dir + "/config/dnsconfig")
 	if os.IsNotExist(err) {
 	if os.IsNotExist(err) {
-		os.Mkdir(dir+"/config/dnsconfig", 0744)
-	} else if err != nil {
+		err = os.MkdirAll(dir+"/config/dnsconfig", 0744)
+	}
+	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")
 	_, err = os.Stat(dir + "/config/dnsconfig/Corefile")
 	if os.IsNotExist(err) {
 	if os.IsNotExist(err) {
 		err = logic.SetCorefile(".")
 		err = logic.SetCorefile(".")
@@ -36,6 +39,7 @@ func SetDNSDir() error {
 			logger.Log(0, err.Error())
 			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")

+ 4 - 2
logic/dns.go

@@ -115,10 +115,12 @@ func SetCorefile(domains string) error {
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
+
 	_, err = os.Stat(dir + "/config/dnsconfig")
 	_, err = os.Stat(dir + "/config/dnsconfig")
 	if os.IsNotExist(err) {
 	if os.IsNotExist(err) {
-		os.Mkdir(dir+"/config/dnsconfig", 744)
-	} else if err != nil {
+		err = os.MkdirAll(dir+"/config/dnsconfig", 744)
+	}
+	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
 	}
 	}