Merge branch 'master' of git.grml.org:grml-server-setup
authorAlexander Wirt <formorer@grml.org>
Thu, 21 Feb 2013 08:46:30 +0000 (09:46 +0100)
committerAlexander Wirt <formorer@grml.org>
Thu, 21 Feb 2013 08:46:30 +0000 (09:46 +0100)
1  2 
ips

diff --cc ips
--- 1/ips
--- 2/ips
+++ b/ips
@@@ -5,10 -10,10 +10,10 @@@ We handle reverse dns for IPv6 ourselfs
  83.246.69.168/29
  ----------------
  
- 83.246.69.169   ipmi
+ 83.246.69.169 router
  83.246.69.170         father.grml.org - kvm host
  83.246.69.171 mail.grml.org - mailsystem
 -83.246.69.172 repos.grml.org - debian repos
 +83.246.69.172 repos.grml.org - git repos
  83.246.69.173 misc.grml.org - dns, and other stuff
  83.246.69.174 web.grml.org - webserver
  
  83.246.69.180
  83.246.69.181
  83.246.69.182   grandfather.grmlorg - ipmi interface
 -2a00:7b80:3012:12::2 - jenkins.grml.org
+ 2a02:0790:1:12::1/64
+ ---------------------
+ 2a02:0790:1:12::1   router
+ 2a02:0790:1:12::2   father.grml.org
+ 2a02:0790:1:12::3   mail.grml.org
+ 2a02:0790:1:12::4   repos.grml.org
+ 2a02:0790:1:12::5   misc.grml.org
+ 2a02:0790:1:12::6   web.grml.org
+ SnelServer
+ ==========
+ Nameserver: 89.207.128.252 89.207.130.252 89.207.132.252
+ Gateway: 77.95.228.125
+ Netmask: 255.255.255.0
+ 77.95.228.50 - ipmi
+ 77.95.228.51 - klaus.grml.org
+ 77.95.228.18 - jenkins.grml.org
+ 77.95.228.19 - backup.grml.org
+ 77.95.228.125 - blog.grml.org
+ 77.95.228.126
+ 77.95.228.127
+ 77.95.228.128
+ 77.95.228.129
+ 2a00:7b80:3012:12::1/64
+ ------------------------
+ Gateway 2a00:7b80:3012::1
+ Nameserver #1   2a00:7b80:3003:1::1
+ Nameserver #2   2a00:7b80:450:1::1
+ 2a00:7b80:3012:12::1 - klaus.grml.org
++2a00:7b80:3012:12::2 - jenkins.grml.org