Merge branch 'master' of github.com:FreifunkBremen/ffhb-dns
Conflicts: data/bremen.freifunk.net.zone
This commit is contained in:
commit
ffd0d85a34
|
@ -1,6 +1,6 @@
|
|||
$TTL 1D
|
||||
@ IN SOA ns01 noc.bremen.freifunk.net. (
|
||||
2016021301 ; Serial
|
||||
2016021801 ; Serial
|
||||
4H ; Refresh
|
||||
1H ; Retry
|
||||
2W ; Expire
|
||||
|
@ -54,7 +54,7 @@ nodes NS vpn02
|
|||
nodes NS vpn03
|
||||
|
||||
node A 10.196.0.127
|
||||
AAAA fd2f:5119:f2c::127
|
||||
AAAA 2a06:8782:ffbb:1337::127
|
||||
|
||||
mesh CNAME www
|
||||
|
||||
|
|
Loading…
Reference in New Issue