From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 12 Sep 2010 18:52:34 +0000 (+0100)
Subject: Merge branch 'master' into stable-6.x
X-Git-Tag: 6.7.0~14
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=commitdiff_plain;h=c57d4c361a88f00f0d6dfc3bcb20f87f1d957527;hp=3e4a7984047224b0ffc532bbfaec359b37a7bc63;p=ypp-sc-tools.main.git

Merge branch 'master' into stable-6.x
---

diff --git a/.gitignore b/.gitignore
index 0f48304..4a7181e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@ t
 
 core
 vgcore.*
+*.orig
+*.rej
 
 yarrg/*.o
 yarrg/t.*
diff --git a/yarrg/web/robots.txt b/yarrg/web/robots.txt
new file mode 100755
index 0000000..38a5ff7
--- /dev/null
+++ b/yarrg/web/robots.txt
@@ -0,0 +1,11 @@
+<%flags>
+inherit => undef
+</%flags>
+<%perl>
+$r->content_type('text/plain');
+</%perl>
+User-Agent: *
+Disallow: /lookup
+Disallow: /test/code/lookup
+Disallow: /test/data/lookup
+Disallow: /test/both/lookup