Skip to content

Commit

Permalink
#291: Adjustments for linux resolver (#292)
Browse files Browse the repository at this point in the history
* #291 - adjust resolver on linux
* #291 - adjust typo
* Add new line suffix to linux resolver
  • Loading branch information
fubarhouse committed Feb 4, 2021
1 parent 91fb434 commit 5b51ce9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 17 deletions.
10 changes: 5 additions & 5 deletions service/library/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ func Setup(c *Config) {
Name: "MacOS Resolver",
}

var ResolvGeneric = resolv.Resolv{
Data: "nameserver 127.0.0.1 # added by amazee.io pygmy",
var ResolvLinux = resolv.Resolv{
Data: "# Generated by amazeeio pygmy\n[Resolve]\nDNS=127.0.0.1:6053\nDomains=docker.amazee.io\n",
Enabled: true,
File: "resolv.conf",
Folder: "/etc",
File: "docker.amazee.io.conf",
Folder: "/usr/lib/systemd/resolved.conf.d",
Name: "Linux Resolver",
}

Expand All @@ -103,7 +103,7 @@ func Setup(c *Config) {
})
} else if runtime.GOOS == "linux" {
viper.SetDefault("resolvers", []resolv.Resolv{
ResolvGeneric,
ResolvLinux,
})
} else if runtime.GOOS == "windows" {
viper.SetDefault("resolvers", []resolv.Resolv{})
Expand Down
19 changes: 7 additions & 12 deletions service/resolv/resolv.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,18 +156,13 @@ func (resolv Resolv) Clean() {
}
}

if runtime.GOOS == "darwin" {

if strings.HasPrefix(fullPath, "/etc/resolver/") {
if _, err := os.Stat(fullPath); err == nil {
err := run([]string{"sudo", "rm", fullPath})
if err != nil {
fmt.Println(err)
}
if !resolv.statusFile() {
fmt.Println("Successfully removed resolver file")
}
}
if _, err := os.Stat(fullPath); err == nil {
err := run([]string{"sudo", "rm", fullPath})
if err != nil {
fmt.Println(err)
}
if !resolv.statusFile() {
fmt.Println("Successfully removed resolver file")
}
}

Expand Down

0 comments on commit 5b51ce9

Please sign in to comment.