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

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index 82ab637..d81f157 100644 (file)
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -1,3 +1,4 @@
+.git
 .cvsignore
 CVS
 archive

diff --git a/web/conf/apache2.0/cartney-dev.conf b/web/conf/apache2.0/cartney-dev.conf
new file mode 100644 (file)
index 0000000..6442e68
--- /dev/null
+++ b/web/conf/apache2.0/cartney-dev.conf
@@ -0,0 +1,46 @@
+# This is the configuration that I (Mike) use on the development
+# machine cartney, which is a MacBook Pro
+#
+# See comments in mk2-config-cmc/apache/cmc-dev-mac.conf for details
+# on running HTML::Mason-based sites under the apache2 port for Macs.
+
+PerlSwitches -I/usr/local/src/git/irspy/lib
+
+# Empirally, it seems that including this next line prevents the bug
+# in which some but not all requests result in the error:
+#      Undefined subroutine &ZOOM::IRSpy::connect_to_registry
+# (This ought not to make any difference, as the Apache2::Request
+# module should of course get loaded from within IRSpy anyway, but you
+# never know with Apache.)
+PerlModule Apache2::Request
+
+<VirtualHost *:80>
+    ServerName x.irspy.indexdata.com
+    <Directory />
+        Allow from all
+    </Directory>
+
+    ErrorLog     /opt/local/apache2/logs/irspy-error.log
+    CustomLog    /opt/local/apache2/logs/irspy-access.log combined
+    DocumentRoot /usr/local/src/git/irspy/web/htdocs
+    <FilesMatch "\.(html|css)$">
+     SetHandler perl-script
+     PerlHandler HTML::Mason::ApacheHandler
+    </FilesMatch>
+
+    PerlSetVar MasonArgsMethod mod_perl
+
+    PerlAddVar MasonCompRoot "private => /usr/local/src/git/irspy/web/htdocs"
+    PerlSetVar MasonDataDir /tmp/irspy-mason
+    # IRSpyLibDir is used only to find source for online documentation
+    PerlSetVar IRSpyLibDir /usr/local/src/git/irspy/lib
+    PerlSetEnv PERL5LIB /usr/local/src/git/irspy/lib
+
+    <Location /admin>
+       AuthType Basic
+       AuthName "IRSpy Administration"
+       AuthUserFile /usr/local/src/git/irspy/web/conf/htpasswd
+       Require user admin
+    </Location>
+</VirtualHost>
+

diff --git a/web/conf/apache2.0/irspy-test.conf b/web/conf/apache2.0/irspy-test.conf
index 8bdd0df..bc53345 100644 (file)
--- a/web/conf/apache2.0/irspy-test.conf
+++ b/web/conf/apache2.0/irspy-test.conf
@@ -26,7 +26,7 @@
     PerlAddVar MasonCompRoot "private => /usr/local/src/git/irspy-test/web/htdocs"
     PerlSetVar MasonDataDir              /usr/local/src/git/irspy-test/web/data
     PerlSetVar IRSpyLibDir               /usr/local/src/git/irspy-test/lib
-    PerlSetEnv IRSpyDbName     localhost:8019/IR-Explain---2
+    PerlSetEnv IRSpyDbName     localhost:8019/IR-Explain---1
 
     PerlSetEnv PERL5LIB /usr/local/src/git/irspy/lib
 

diff --git a/web/conf/apache2.0/xeno-dev.conf b/web/conf/apache2.0/xeno-dev.conf
index ab274ec..c86e46d 100644 (file)
--- a/web/conf/apache2.0/xeno-dev.conf
+++ b/web/conf/apache2.0/xeno-dev.conf
@@ -1,4 +1,5 @@
-# This is the configuration that I use on the development machine xeno
+# This is the configuration that I (Mike) use on the development
+# machine xeno, which is a Ubuntu 9.10 box.
 
 <VirtualHost *:80>
     ServerName x.irspy.indexdata.com

diff --git a/zebra/Makefile b/zebra/Makefile
index d34a46b..0d94a1f 100644 (file)
--- a/zebra/Makefile
+++ b/zebra/Makefile
@@ -36,7 +36,7 @@ newdb-test:
        ${ZEBRAIDX_TEST} update ${IRSPY_ARCHIVE}
        ${ZEBRAIDX_TEST} commit
 
-# note: the test database use localhost:8019/IR-Explain---2
+# note: the test database use localhost:8019/IR-Explain---1
 dump:
        rm -rf records-${DATE}.old
        -test -e records-${DATE} && mv records-${DATE} records-${DATE}.old

diff --git a/zebra/README b/zebra/README
index 2898e93..2ac6c19 100644 (file)
--- a/zebra/README
+++ b/zebra/README
@@ -107,7 +107,7 @@ or:
 tar xzf records-2007-04-18.tar.gz
 zebraidx-2.0 init
 zebraidx-2.0 update zeerex.xml
-zebraidx-2.0 update record-2010-04-06
+zebraidx-2.0 update records-2010-04-06
 zebraidx-2.0 commit
 
 zebrasrv-2.0 -f yazserver.xml

diff --git a/zebra/htpasswd.unencrypted b/zebra/htpasswd.unencrypted
new file mode 100644 (file)
index 0000000..7b7047b
--- /dev/null
+++ b/zebra/htpasswd.unencrypted
@@ -0,0 +1 @@
+admin:fruitbat

diff --git a/zebra/init-script-test b/zebra/init-script-test
index dedf4af..68e4f66 100755 (executable)
--- a/zebra/init-script-test
+++ b/zebra/init-script-test
@@ -18,7 +18,7 @@ logfile=/var/log/irspy-test-zebra.log
 pidfile=/var/run/irspy-test-zebra.pid
 
 case "`hostname`" in
-    nigiri | xeno | rafa | test) IRSPYDIR=/usr/local/src/git/irspy-test/;;
+    nigiri | donut | xeno | rafa | test) IRSPYDIR=/usr/local/src/git/irspy-test/;;
     shawarma|kafta) IRSPYDIR=/home/mike/cvs/irspy/;;
     your-development-machine ) 
        IRSPYDIR=/home/foobar/indexdata/irspy/

diff --git a/zebra/yazserver-test.xml b/zebra/yazserver-test.xml
index a642390..92b64cf 100644 (file)
--- a/zebra/yazserver-test.xml
+++ b/zebra/yazserver-test.xml
@@ -12,7 +12,7 @@
      <serverInfo>
       <host>localhost</host>
       <port>8019</port>
-      <database>IR-Explain---2</database>
+      <database>IR-Explain---1</database>
      </serverInfo>
     </explain>
    </xi:fallback>

diff --git a/zebra/zebra-test.cfg b/zebra/zebra-test.cfg
index 6169c28..864f6d5 100644 (file)
--- a/zebra/zebra-test.cfg
+++ b/zebra/zebra-test.cfg
@@ -16,7 +16,7 @@ storeKeys: 1
 # Use the "alvis" filter with config file "filterconf.xml"
 recordtype: alvis.filterconf.xml
 
-database: IR-Explain---2
+database: IR-Explain---1
 #database: Default
 
 # where to put registers, and other var content, and how large they may be

diff --git a/zebra/zebra.cfg b/zebra/zebra.cfg
index 4e161a1..cca9a4b 100644 (file)
--- a/zebra/zebra.cfg
+++ b/zebra/zebra.cfg
@@ -1,12 +1,12 @@
 
 # Where to look for config files
 #profilePath: .:/usr/local/share/idzebra-2.0/tab:/usr/share/idzebra-2.0/tab
-profilePath: .:/usr/share/idzebra-2.0/tab
+profilePath: .:/usr/share/idzebra-2.0/tab:/opt/local/share/idzebra-2.0/tab
 
 # Where to look for loadable zebra modules.  Both these path components
-# are necessary, since the former is used when installing from a Debian
-# package and the latter when installing from a CVS build.
-modulePath: /usr/lib/idzebra-2.0/modules
+# are necessary, since the former is used when installed from a Debian
+# package and the latter when installed from a Mac port.
+modulePath: /usr/lib/idzebra-2.0/modules:/opt/local/lib/idzebra-2.0/modules
 #modulePath: /usr/local/lib/idzebra-2.0/modules
 
 # store records and record keys internally
@@ -28,5 +28,6 @@ keytmpdir: db/tmp
 # Permissions for update
 perm.anonymous: ra
 perm.admin: rw
-passwd.c: htpasswd
+#passwd.c: htpasswd
+passwd: htpasswd.unencrypted
 

diff --git a/zebra/zeerex-test.xml b/zebra/zeerex-test.xml
index 95a25c1..aba40eb 100644 (file)
--- a/zebra/zeerex-test.xml
+++ b/zebra/zeerex-test.xml
@@ -5,7 +5,7 @@
  <serverInfo protocol="SRW/SRU/Z39.50" version="1.1" method="GET/POST">
   <host>localhost</host>
   <port>8019</port>
-  <database>IR-Explain---2</database>
+  <database>IR-Explain---1</database>
  </serverInfo>
 
  <databaseInfo>