File tree Expand file tree Collapse file tree 3 files changed +7
-19
lines changed Expand file tree Collapse file tree 3 files changed +7
-19
lines changed Original file line number Diff line number Diff line change @@ -61,6 +61,7 @@ services:
61
61
image : coredns/coredns:1.10.1
62
62
command : -conf /root/dnsconfig/Corefile
63
63
env_file : ./netmaker.env
64
+ restart : always
64
65
depends_on :
65
66
- netmaker
66
67
volumes :
Original file line number Diff line number Diff line change @@ -26,23 +26,16 @@ func SetDNSDir() error {
26
26
return err
27
27
}
28
28
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 )
33
30
if err != nil {
34
31
logger .Log (0 , "couldnt find or create /config/dnsconfig" )
35
32
return err
36
33
}
37
34
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 ())
44
38
}
45
-
46
39
_ , err = os .Stat (dir + "/config/dnsconfig/netmaker.hosts" )
47
40
if os .IsNotExist (err ) {
48
41
_ , err = os .Create (dir + "/config/dnsconfig/netmaker.hosts" )
Original file line number Diff line number Diff line change @@ -11,7 +11,6 @@ import (
11
11
"github.com/gravitl/netmaker/database"
12
12
"github.com/gravitl/netmaker/logger"
13
13
"github.com/gravitl/netmaker/models"
14
- "github.com/gravitl/netmaker/servercfg"
15
14
"github.com/txn2/txeh"
16
15
)
17
16
@@ -159,17 +158,13 @@ func SetCorefile(domains string) error {
159
158
return err
160
159
}
161
160
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 )
166
162
if err != nil {
167
163
logger .Log (0 , "couldnt find or create /config/dnsconfig" )
168
164
return err
169
165
}
170
166
171
167
corefile := domains + ` {
172
- bind %s
173
168
reload 15s
174
169
hosts /root/dnsconfig/netmaker.hosts {
175
170
fallthrough
@@ -178,8 +173,7 @@ func SetCorefile(domains string) error {
178
173
log
179
174
}
180
175
`
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 )
183
177
if err != nil {
184
178
return err
185
179
}
You can’t perform that action at this time.
0 commit comments