Merge git.dn42.us:dn42/registry

Conflicts:
	data/inetnum/172.21.118.0_25
This commit is contained in:
zhangliangdong 2018-06-20 11:18:31 +08:00
commit 3706fbb82f
106 changed files with 659 additions and 111 deletions

View file

@ -3,7 +3,7 @@ descr: Droid Nest
admin-c: DSX-DN42
tech-c: DSX-DN42
mnt-by: DROIDNEST-MNT
nserver: ns1.droidnest.dn42 fd16:c638:3d7c:d::1
nserver: ns2.droidnest.dn42 172.20.148.74
nserver: ns1.droidnest.dn42 172.20.148.73
nserver: ns1.droidnest.dn42 fd16:c638:3d7c::
status: CONNECT
source: DN42

View file

@ -3,7 +3,6 @@ org: ORG-RZL
status: CONNECT
nserver: ns1.rzl.g.nic.dn42 172.22.36.250
mnt-by: LUTOMA-MNT
mnt-by: FELICITUS-MNT
mnt-by: DOCSTEEL-MNT
mnt-by: HAX404-MNT
source: DN42

7
data/dns/yamakaja.dn42 Normal file
View file

@ -0,0 +1,7 @@
domain: yamakaja.dn42
admin-c: YAMAKAJA-DN42
tech-c: YAMAKAJA-DN42
mnt-by: YAMAKAJA-MNT
nserver: ns1.yamakaja.dn42 172.20.20.64
status: CONNECT
source: DN42