zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-07 01:36:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into refactor-controllers

Browse Source
This commit is contained in:
Matthew R Kasun
2021-05-09 10:52:42 -04:00
parent 71cf7bfb77 2c227c8f10
commit 073be947c6
37 changed files with 2517 additions and 1283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
controllers/dnsHttpController.go
View File

@@ -175,6 +175,40 @@ func GetCustomDNS(network string) ([]models.DNSEntry, error) {
return dns, err
}
func SetDNS() error {
hostfile := txeh.Hosts{}
var corefilestring string
networks, err := functions.ListNetworks()
if err != nil {
return err
}
for _, net := range networks {
corefilestring = corefilestring + net.NetID + " "
dns, err := GetDNS(net.NetID)
if err != nil {
return err
}
for _, entry := range dns {
hostfile.AddHost(entry.Address, entry.Name+"."+entry.Network)
if err != nil {
return err
}
}
}
if corefilestring == "" {
corefilestring = "example.com"
}
err = hostfile.SaveAs("./config/dnsconfig/netmaker.hosts")
if err != nil {
return err
}
err = functions.SetCorefile(corefilestring)
return err
}
func GetDNSEntryNum(domain string, network string) (int, error) {
num := 0
@@ -418,7 +452,7 @@ func pushDNS(w http.ResponseWriter, r *http.Request) {
// Set header
w.Header().Set("Content-Type", "application/json")
err := WriteHosts()
err := SetDNS()
if err != nil {
returnErrorResponse(w, r, formatError(err, "internal"))
@@ -427,35 +461,6 @@ func pushDNS(w http.ResponseWriter, r *http.Request) {
json.NewEncoder(w).Encode("DNS Pushed to CoreDNS")
}
func WriteHosts() error {
//hostfile, err := txeh.NewHostsDefault()
hostfile := txeh.Hosts{}
/*
if err != nil {
return err
}
*/
networks, err := functions.ListNetworks()
if err != nil {
return err
}
for _, net := range networks {
dns, err := GetDNS(net.NetID)
if err != nil {
return err
}
for _, entry := range dns {
hostfile.AddHost(entry.Address, entry.Name+"."+entry.Network)
if err != nil {
return err
}
}
}
err = hostfile.SaveAs("./config/netmaker.hosts")
return err
}
func ValidateDNSCreate(entry models.DNSEntry) error {
v := validator.New()