Merge branch 'master' of github.com:FreifunkBremen/ffhb-dns

Conflicts:
	data/bremen.freifunk.net.zone
This commit is contained in:
mortzu 2015-08-04 21:47:43 +02:00
commit 71236f0220
1 changed files with 2 additions and 1 deletions

View File

@ -1,6 +1,6 @@
$TTL 1D
@ IN SOA ns01 noc.bremen.freifunk.net. (
2015072801 ; Serial
2015080401 ; Serial
4H ; Refresh
1H ; Retry
2W ; Expire
@ -28,6 +28,7 @@ vpn01 30s A 176.9.147.213
vpn02 30s A 31.24.146.93
vpn03 30s A 37.72.148.148
vpn04 30s A 136.243.21.39
vpn05 30s A 37.120.165.95
vpn CNAME @
; mail