diff options
| author | Jonas <dr@jones.dk> | 2011-05-18 19:58:53 +0200 |
|---|---|---|
| committer | Jonas <dr@jones.dk> | 2011-05-18 19:58:53 +0200 |
| commit | a0e60be0d98db36be4c21a04ff897f9b3d1bf3dd (patch) | |
| tree | e79f350194ac955ca626924d32d78104d7db5057 /bind | |
| parent | 683354aff6ed39d1723a5a04aafe4bafd454788c (diff) | |
| parent | bc5a6f489de8ffdfc8e0913a50e97a2fdc1aaf44 (diff) | |
Merge branch 'master' of git://source.jones.dk/local-JONES.DK
Conflicts:
bind/fake-222/jones.dk
Diffstat (limited to 'bind')
| -rw-r--r-- | bind/fake-222/jones.dk | 5 | ||||
| -rw-r--r-- | bind/pri/jones.dk | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/bind/fake-222/jones.dk b/bind/fake-222/jones.dk index 52d42cc..60caf6f 100644 --- a/bind/fake-222/jones.dk +++ b/bind/fake-222/jones.dk @@ -137,6 +137,11 @@ gmork A 192.168.222.56 SPF "v=spf1 -all" HINFO "Transmeta Crusoe TM5600 (Sony VAIO PCG-C1VE)" "Debian GNU/Linux" TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard" +atreju A 192.168.222.57 + MX 0 . + SPF "v=spf1 -all" + HINFO "Intel Atom D525 @ 1.80GHz (ZOTAC NM10-ITX)" "Debian GNU/Linux" + TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard" hysbald A 192.168.222.252 ;2.107.136.66; via xayide.jones.dk MX 0 . SPF "v=spf1 -all" diff --git a/bind/pri/jones.dk b/bind/pri/jones.dk index a0f5bd6..b756e31 100644 --- a/bind/pri/jones.dk +++ b/bind/pri/jones.dk @@ -132,6 +132,10 @@ auryn-old MX 0 . SPF "v=spf1 -all" HINFO "PowerPC 7410 (Apple albook)" "Debian GNU/Linux" TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard" +atreju MX 0 . + SPF "v=spf1 -all" + HINFO "Intel Atom D525 @ 1.80GHz (ZOTAC NM10-ITX)" "Debian GNU/Linux" + TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard" hysbald A 2.107.136.66 ; via xayide.jones.dk MX 0 . SPF "v=spf1 -all" |