Skip to content

#325: File field on Resolv is not being respected correctly. #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fubarhouse merged 2 commits into from
Jul 27, 2021
Merged

#325: File field on Resolv is not being respected correctly. #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
869d7b3
Ensure Domain field is properly set when nil
fubarhouse Jul 27, 2021
3314554
format resolv files as .conf files
fubarhouse Jul 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion service/library/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -87,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",
}
Expand Down
10 changes: 5 additions & 5 deletions service/resolv/resolv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")))
}
}
}
Expand Down