From 869d7b3c9a0ffe9cd819526f57fef021134afc08 Mon Sep 17 00:00:00 2001 From: Karl Hepworth Date: Tue, 27 Jul 2021 21:30:37 +1000 Subject: [PATCH 1/2] Ensure Domain field is properly set when nil Signed-off-by: Karl Hepworth --- service/library/setup.go | 5 ++++- service/resolv/resolv.go | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/service/library/setup.go b/service/library/setup.go index 2572a7e8..73275081 100644 --- a/service/library/setup.go +++ b/service/library/setup.go @@ -76,6 +76,9 @@ func Setup(c *Config) { // Set the default domain. viper.SetDefault("domain", "docker.amazee.io") + if c.Domain == "" { + c.Domain = viper.GetString("domain") + } // Resolvers don't have hard defaults defined which // are mergable. So we set them in viper before @@ -95,7 +98,7 @@ func Setup(c *Config) { var ResolvLinux = resolv.Resolv{ Data: fmt.Sprintf("# Generated by amazeeio pygmy\n[Resolve]\nDNS=127.0.0.1:6053\nDomains=%s\n", c.Domain), Enabled: true, - File: fmt.Sprintf("%s.conf", c.Domain), + File: c.Domain, Folder: "/usr/lib/systemd/resolved.conf.d", Name: "Linux Resolver", } diff --git a/service/resolv/resolv.go b/service/resolv/resolv.go index 6d4c2738..c7c6d0a7 100644 --- a/service/resolv/resolv.go +++ b/service/resolv/resolv.go @@ -177,20 +177,20 @@ func (resolv Resolv) Clean() { ifConfig := exec.Command("/bin/sh", "-c", "sudo ifconfig lo0 -alias 172.16.172.16") err := ifConfig.Run() if err != nil { - color.Print(Sprintf(Red("error removing loopback UP alias"), Red(err))) + color.Print(Sprintf(Red("error removing loopback UP alias\n"), Red(err))) } else { if !resolv.statusNet() { - color.Print(Sprintf(Green("Successfully removed loopback alias IP."))) + color.Print(Sprintf(Green("Successfully removed loopback alias IP.\n"))) } } } - killAll := exec.Command("/bin/sh", "-c", "sudo killall mDNSResponder") + killAll := exec.Command("/bin/sh", "-c", "sudo killall mDNSResponder\n") err := killAll.Run() if err != nil { - color.Print(Sprintf(Red("error restarting mDNSResponder"))) + color.Print(Sprintf(Red("error restarting mDNSResponder\n"))) } else { - color.Print(Sprintf(Green("Successfully restarted mDNSResponder"))) + color.Print(Sprintf(Green("Successfully restarted mDNSResponder\n"))) } } } From 33145541c9a55c7c50d8455038c38aef287ef46d Mon Sep 17 00:00:00 2001 From: Karl Hepworth Date: Tue, 27 Jul 2021 21:32:50 +1000 Subject: [PATCH 2/2] format resolv files as .conf files Signed-off-by: Karl Hepworth --- service/library/setup.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/library/setup.go b/service/library/setup.go index 73275081..74f7da6a 100644 --- a/service/library/setup.go +++ b/service/library/setup.go @@ -90,7 +90,7 @@ func Setup(c *Config) { var ResolvMacOS = resolv.Resolv{ Data: "# Generated by amazeeio pygmy\nnameserver 127.0.0.1\nport 6053\n", Enabled: true, - File: c.Domain, + File: fmt.Sprintf("%s.conf", c.Domain), Folder: "/etc/resolver", Name: "MacOS Resolver", } @@ -98,7 +98,7 @@ func Setup(c *Config) { var ResolvLinux = resolv.Resolv{ Data: fmt.Sprintf("# Generated by amazeeio pygmy\n[Resolve]\nDNS=127.0.0.1:6053\nDomains=%s\n", c.Domain), Enabled: true, - File: c.Domain, + File: fmt.Sprintf("%s.conf", c.Domain), Folder: "/usr/lib/systemd/resolved.conf.d", Name: "Linux Resolver", }