From 52a80a90f2db12b5f06c21c5dc733ea550a7c29c Mon Sep 17 00:00:00 2001
From: Jeffrey Forman <jforman@malbec.home.jeffreyforman.net>
Date: Thu, 6 Dec 2012 20:13:07 -0500
Subject: [PATCH] Add testdata to repo, named.conf and forward/reverse zones.

Clean up the main readme.md
---
 README.markdown                  |  7 +------
 binder/testdata/README.md        | 33 ++++++++++++++++++++++++++++++++
 binder/testdata/binder-test.key  |  6 ++++++
 binder/testdata/db.10.254.1      |  9 +++++++++
 binder/testdata/db.domain1.local |  9 +++++++++
 5 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 binder/testdata/README.md
 create mode 100644 binder/testdata/binder-test.key
 create mode 100644 binder/testdata/db.10.254.1
 create mode 100644 binder/testdata/db.domain1.local

diff --git a/README.markdown b/README.markdown
index a5d8ed3..d9239b4 100644
--- a/README.markdown
+++ b/README.markdown
@@ -50,11 +50,6 @@ Where /etc/bind/test.key:
 
 Deploy the Django application as you see fit, and create the database via `manage.py syncdb`.
 
-Using the Admin UI, add each DNS Server to the 'Bind Servers' model under the bcommon app.
+Using the Admin UI, add each DNS Server to the 'Bind Servers' model.
 
 Once you have completed this, surf over to the URL where the binder Django app is installed and enjoy. 
-
-## Todo ##
-
-* Associate Keys with DNS Servers
- * Should we auto-populate the DB with a DNS Server's zones upon add?
diff --git a/binder/testdata/README.md b/binder/testdata/README.md
new file mode 100644
index 0000000..3510c53
--- /dev/null
+++ b/binder/testdata/README.md
@@ -0,0 +1,33 @@
+Binder Test Data Readme
+=======================
+
+Description
+-----------
+Contained in this directory are the Bind configuration and zone files necessary to run the integration tests.
+
+These configuration files were tested on a Ubuntu 12.10 x64 server running Bind 9.8.1.
+
+### named.conf
+
+Bind's standard configuration file for options and zone data.
+
+This is expected to be installed in /etc/named/
+
+## binder-test.key
+
+TSIG key file used for securing zone transfers and updates. Key name contained is "test-key",
+using the MD5 algorithm.
+
+This is expected to be installed in /etc/named/
+
+## domain1.local
+
+Forward Zone file for domain 'domain1.local'. This contains no records initially on purpose.
+
+This is expected to be installed in /var/lib/bind/
+
+## db.10.254.1
+
+Reverse zone file for domain 'domain1.local'. This contains no records initially on purpose.
+
+This is expected to be installed in /var/lib/bind/
diff --git a/binder/testdata/binder-test.key b/binder/testdata/binder-test.key
new file mode 100644
index 0000000..66368f0
--- /dev/null
+++ b/binder/testdata/binder-test.key
@@ -0,0 +1,6 @@
+// Key to be used in Binder integration tests
+
+key "test-key" {
+          algorithm hmac-md5;
+          secret "kTcmbjZNULvw3qnyZwq5sw==";
+};
diff --git a/binder/testdata/db.10.254.1 b/binder/testdata/db.10.254.1
new file mode 100644
index 0000000..4600959
--- /dev/null
+++ b/binder/testdata/db.10.254.1
@@ -0,0 +1,9 @@
+$ORIGIN 1.254.10.IN-ADDR.ARPA.
+@  1D  IN	 SOA ns1.example.com.	mymail.example.com. (
+			      1 ; serial
+			      3H ; refresh
+			      15 ; retry
+			      1w ; expire
+			      3h ; minimum
+			     )
+       IN  NS     localhost. ; in the domain
diff --git a/binder/testdata/db.domain1.local b/binder/testdata/db.domain1.local
new file mode 100644
index 0000000..792fd78
--- /dev/null
+++ b/binder/testdata/db.domain1.local
@@ -0,0 +1,9 @@
+$ORIGIN domain1.local.
+@  1D  IN	 SOA ns1.example.com.	mymail.example.com. (
+			      1 ; serial
+			      3H ; refresh
+			      15 ; retry
+			      1w ; expire
+			      3h ; minimum
+			     )
+       IN  NS     localhost. ; in the domain