Skip to content

Commit f00e452

Browse files
committed
don't bind coredns to publicip
1 parent 3fac04a commit f00e452

File tree

3 files changed

+7
-19
lines changed

3 files changed

+7
-19
lines changed

compose/docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ services:
6161
image: coredns/coredns:1.10.1
6262
command: -conf /root/dnsconfig/Corefile
6363
env_file: ./netmaker.env
64+
restart: always
6465
depends_on:
6566
- netmaker
6667
volumes:

functions/local.go

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,16 @@ func SetDNSDir() error {
2626
return err
2727
}
2828

29-
_, err = os.Stat(dir + "/config/dnsconfig")
30-
if os.IsNotExist(err) {
31-
err = os.MkdirAll(dir+"/config/dnsconfig", 0744)
32-
}
29+
err = os.MkdirAll(dir+"/config/dnsconfig", 0744)
3330
if err != nil {
3431
logger.Log(0, "couldnt find or create /config/dnsconfig")
3532
return err
3633
}
3734

38-
_, err = os.Stat(dir + "/config/dnsconfig/Corefile")
39-
if os.IsNotExist(err) {
40-
err = logic.SetCorefile(".")
41-
if err != nil {
42-
logger.Log(0, err.Error())
43-
}
35+
err = logic.SetCorefile(".")
36+
if err != nil {
37+
logger.Log(0, err.Error())
4438
}
45-
4639
_, err = os.Stat(dir + "/config/dnsconfig/netmaker.hosts")
4740
if os.IsNotExist(err) {
4841
_, err = os.Create(dir + "/config/dnsconfig/netmaker.hosts")

logic/dns.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"github.com/gravitl/netmaker/database"
1212
"github.com/gravitl/netmaker/logger"
1313
"github.com/gravitl/netmaker/models"
14-
"github.com/gravitl/netmaker/servercfg"
1514
"github.com/txn2/txeh"
1615
)
1716

@@ -159,17 +158,13 @@ func SetCorefile(domains string) error {
159158
return err
160159
}
161160

162-
_, err = os.Stat(dir + "/config/dnsconfig")
163-
if os.IsNotExist(err) {
164-
err = os.MkdirAll(dir+"/config/dnsconfig", 0744)
165-
}
161+
err = os.MkdirAll(dir+"/config/dnsconfig", 0744)
166162
if err != nil {
167163
logger.Log(0, "couldnt find or create /config/dnsconfig")
168164
return err
169165
}
170166

171167
corefile := domains + ` {
172-
bind %s
173168
reload 15s
174169
hosts /root/dnsconfig/netmaker.hosts {
175170
fallthrough
@@ -178,8 +173,7 @@ func SetCorefile(domains string) error {
178173
log
179174
}
180175
`
181-
corebytes := []byte(fmt.Sprintf(corefile, servercfg.GetCoreDNSAddr()))
182-
err = os.WriteFile(dir+"/config/dnsconfig/Corefile", corebytes, 0644)
176+
err = os.WriteFile(dir+"/config/dnsconfig/Corefile", []byte(corefile), 0644)
183177
if err != nil {
184178
return err
185179
}

0 commit comments

Comments
 (0)