From: Mike Taylor <mike@miketaylor.org.uk>
Date: Tue, 20 Apr 2010 15:00:24 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/irspy
X-Git-Tag: CPAN-v1.02~123
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=b52d97fe0c9cf5a4e2c56d89a68a3d8138d11ecb;hp=202b88665c65681023e8bb9cc6274cf8160ab662;p=irspy-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/irspy
---

diff --git a/web/conf/apache2.0/irspy.conf b/web/conf/apache2.0/irspy.conf
index db43e05..5b0a6e3 100644
--- a/web/conf/apache2.0/irspy.conf
+++ b/web/conf/apache2.0/irspy.conf
@@ -49,7 +49,7 @@
       Order deny,allow
       Allow from all
     </Proxy>
-    ProxyPass         /toroid/ http://localhost:3000/
-    ProxyPassReverse  /toroid/ http://localhost:3000/
+    ProxyPass         /toroid/ http://localhost:12367/
+    ProxyPassReverse  /toroid/ http://localhost:12367/
 </VirtualHost>
 
diff --git a/zebra/.gitignore b/zebra/.gitignore
index 3403f67..0241967 100644
--- a/zebra/.gitignore
+++ b/zebra/.gitignore
@@ -2,6 +2,8 @@ records-2007-04-18
 records-2007-05-01
 records-2008-09-16
 records-2010-04-06
+records-2010-04-14
+records-2010-04-20
 terse.properties
 log
 db
diff --git a/zebra/Makefile b/zebra/Makefile
index 0d94a1f..b56e633 100644
--- a/zebra/Makefile
+++ b/zebra/Makefile
@@ -1,5 +1,5 @@
 
-IRSPY_ARCHIVE=		records-2010-04-14
+IRSPY_ARCHIVE=		records-2010-04-20
 IRSPY_ARCHIVE_EXT=	.tar.gz
 DUMP_DIR=		irspy-dump
 ZEBRA_DIR=		db
diff --git a/zebra/irspy-dump/records-2010-04-20.tar.gz b/zebra/irspy-dump/records-2010-04-20.tar.gz
new file mode 100644
index 0000000..d08a2b3
Binary files /dev/null and b/zebra/irspy-dump/records-2010-04-20.tar.gz differ