updated readme

diff --git a/extras/dnsmasq/README b/extras/dnsmasq/README
index ad0937560e7415b0a0682480f6bfa5f63e275c02..2086a393fb6c341c267775ec28c1396a49815f5f 100644 (file)
--- a/extras/dnsmasq/README
+++ b/extras/dnsmasq/README
@@ -1,2 +1 @@
-the only change i made to /etc/dnsmasq.conf was the include line you see in this patch.
-the dnsmasq-vservers.conf file should start out empty - this is just an example from my current running setup.
+dnsmasq should be installed on the host, and the conf.d line included in the main config file

diff --git a/extras/dnsmasq/dnsmasq-vservers.conf b/extras/dnsmasq/dnsmasq-vservers.conf
deleted file mode 100644 (file)
index 28f1f0f..0000000
--- a/extras/dnsmasq/dnsmasq-vservers.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-address=/build.hermia/10.0.0.2
-address=/pg.hermia/10.0.0.4
-address=/web.hermia/10.0.0.3
-address=/moodle.hermia/10.0.0.5
-address=/mahara.hermia/10.0.0.6

diff --git a/extras/dnsmasq/dnsmasq.diff b/extras/dnsmasq/dnsmasq.diff
deleted file mode 100644 (file)
index e00aac2..0000000
--- a/extras/dnsmasq/dnsmasq.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- dnsmasq.conf.example       2008-08-29 13:07:55.000000000 +0100
-+++ dnsmasq.conf       2008-08-29 13:03:12.000000000 +0100
-@@ -469,3 +469,7 @@
- # Include a another lot of configuration options.
- #conf-file=/etc/dnsmasq.more.conf
- #conf-dir=/etc/dnsmasq.d
-+#
-+
-+# configuration for vservers go here
-+conf-file=/etc/dnsmasq-vservers.conf