From: Wolfram Schneider Date: Tue, 6 Apr 2010 15:25:54 +0000 (+0000) Subject: Merge branch 'master' into nigiri X-Git-Tag: CPAN-v1.02~148^2~42 X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=commitdiff_plain;h=7cb6db9edc5505af42944852f8d99ac8152a1b2b;hp=1f34534cfd74b7c211a3bdec6958a23ab9706508 Merge branch 'master' into nigiri --- diff --git a/README b/README index 362353e..24c577b 100644 --- a/README +++ b/README @@ -1,4 +1,3 @@ -$Id: README,v 1.6 2007-04-18 15:22:48 mike Exp $ ZOOM::IRSpy =========== @@ -9,6 +8,37 @@ protocols. It is a successor to the ZSpy program. INSTALLATION +for debian/ubuntu: +------------------- + +DEBIAN DEPENDENCIES + +If you have a Debian-based operating system, you can get what you need +by installing the following packages from the operating system's +package store, using apt-get: + +sudo apt-get install \ + libnet-z3950-zoom-perl \ + libxml-libxml-common-perl \ + liburi-perl \ + libxml-libxml-perl \ + libapache2-mod-perl2 \ + libhtml-mason-perl \ + libapache2-request-perl \ + libapache2-mod-apreq2 \ + libxml-libxslt-perl \ + idzebra-2.0 \ + +you may need one of the following packages for development: + +sudo apt-get install \ + make perl-doc libxml2-utils + +and may enable mod_apreq + +sudo a2enmod apreq + + To install this module type the following: perl Makefile.PL @@ -21,11 +51,11 @@ DEPENDENCIES This module requires these other modules and libraries, in addition to those specified in Makefile.PL: - Zebra, release 1.4.0 or later: see http://indexdata.com/zebra/ + Zebra, release 2.0 or later: see http://www.indexdata.com/zebra/ COPYRIGHT AND LICENCE -Copyright (C) 2006 by Index Data ApS. +Copyright (C) 2006-2010 by Index Data ApS. This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself, either Perl version 5.8.7 or, diff --git a/web/conf/README b/web/conf/README index 9761991..50cb780 100644 --- a/web/conf/README +++ b/web/conf/README @@ -1,3 +1,9 @@ +!!!Note: most part of this document is outdated!!! + +Please have a look at the README in the top-level directory. + +April 2010, Wolfram + $Id: README,v 1.5 2006-10-31 14:17:54 sondberg Exp $ To install the web UI (assuming you're using some version of Apache as diff --git a/web/conf/apache1.3/newshawarma-proxy.conf b/web/conf/apache1.3/newshawarma-proxy.conf deleted file mode 100644 index 1df7db1..0000000 --- a/web/conf/apache1.3/newshawarma-proxy.conf +++ /dev/null @@ -1,16 +0,0 @@ -# $Id: newshawarma-proxy.conf,v 1.3 2007-06-25 10:39:22 mike Exp $ -# -# A very simple configuration to proxy the IRSpy server to a separate -# Apache instance running on the same host. This separation is useful -# to isolate IRSpy from other sites' errors and vice versa. - - - ServerName irspy.indexdata.com - ServerAlias targettest.indexdata.com - ProxyPass / http://irspy.indexdata.com:81/ - ProxyPassReverse / http://irspy.indexdata.com:81/ - - # These are the logs for the proxying operation - ErrorLog /var/log/apache/irspy-error.log - CustomLog /var/log/apache/irspy-access.log combined - diff --git a/web/conf/apache1.3/newshawarma.conf b/web/conf/apache1.3/newshawarma.conf deleted file mode 100644 index 1e0e5e6..0000000 --- a/web/conf/apache1.3/newshawarma.conf +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: newshawarma.conf,v 1.4 2009-05-26 07:29:56 mike Exp $ -# -# Sample configuration for running an IRSpy web-site under Apache 1.3. -# -# This is the configuration that I use on the live machine, -# newshawarma, which is a PC running Debian GNU/Linux 3.1. -# On this machine, the IRSpy software is at -# /home/mike/cvs/irspy -# -# This file can be included in the Apache configuration by adding a -# line like this to apache.conf or one of its included files: -# Include /home/mike/cvs/irspy/web/conf/apache1.3/newshawarma.conf -# -# When running on Debian, don't forget to -# install libapache-request-perl as well as libhtml-mason-perl, -# otherwise Mason will fail mysteriously. -# -# And do NOT attempt to install ZAP on the same apache, that is known -# to fail! - - - ServerName irspy.indexdata.com - ErrorLog /var/log/apache-irspy/irspy-error.log - CustomLog /var/log/apache-irspy/irspy-access.log combined - DocumentRoot /home/mike/cvs/irspy/web/htdocs - - SetHandler perl-script - PerlHandler HTML::Mason::ApacheHandler - - PerlAddVar MasonCompRoot "private => /home/mike/cvs/irspy/web/htdocs" - PerlSetVar MasonDataDir /home/mike/cvs/irspy/web/data - PerlSetVar IRSpyLibDir /home/mike/cvs/irspy/lib - PerlSetEnv PERL5LIB /home/mike/cvs/irspy/lib - - AuthType Basic - AuthName "IRSpy Administration" - AuthUserFile /home/mike/cvs/irspy/web/conf/htpasswd - Require user admin - - - - - ServerName targettest.indexdata.com - Redirect permanent / http://irspy.indexdata.com/ - diff --git a/web/conf/apache1.3/rafa.conf b/web/conf/apache1.3/rafa.conf deleted file mode 100644 index 5b44dfb..0000000 --- a/web/conf/apache1.3/rafa.conf +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: rafa.conf,v 1.1 2007-05-02 13:54:40 mike Exp $ -# -# Sample configuration for running an IRSpy web-site under Apache 1.3. -# -# This is the configuration that I use on the development machine, -# xeno, which is a Fujitu-Siemens SCENIC X102 PC running Ubuntu Linux -# release 6.06. On this machine, the IRSpy software is at -# /usr/local/src/cvs/irspy -# -# This file can be included in the Apache configuration by adding a -# line like this to apache.conf or one of its included files: -# Include /usr/local/src/cvs/irspy/web/conf/apache1.3/xeno.conf -# -# When running on Ubuntu (and probably Debian), don't forget to -# install libapache-request-perl as well as libhtml-mason-perl, -# otherwise Mason will fail mysteriously. - - - ServerName x.irspy.indexdata.com - ErrorLog /var/log/apache/irspy-error.log - CustomLog /var/log/apache/irspy-access.log combined - DocumentRoot /usr/local/src/cvs/irspy/web/htdocs - - SetHandler perl-script - PerlHandler HTML::Mason::ApacheHandler - - PerlAddVar MasonCompRoot "private => /usr/local/src/cvs/irspy/web/htdocs" - PerlSetVar MasonDataDir /usr/local/src/cvs/irspy/web/data - PerlSetVar IRSpyLibDir /usr/local/src/cvs/irspy/lib - PerlSetEnv PERL5LIB /usr/local/src/cvs/irspy/lib - PerlInitHandler Apache::Reload - PerlSetVar ReloadAll Off - PerlSetVar ReloadModules "ZOOM::IRSpy::Utils" - - AuthType Basic - AuthName "IRSpy Administration" - AuthUserFile /usr/local/src/cvs/irspy/web/conf/htpasswd - Require user admin - - diff --git a/web/conf/apache1.3/test.conf b/web/conf/apache1.3/test.conf deleted file mode 100644 index 255bd3e..0000000 --- a/web/conf/apache1.3/test.conf +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: test.conf,v 1.5 2007-02-20 18:51:37 mike Exp $ -# -# Sample configuration for running an IRSpy web-site under Apache 1.3. -# -# This is the configuration that I use on the staging machine, -# test, which is a PC running Debian GNU/Linux 3.1. -# On this machine, the IRSpy software is at -# /usr/local/src/cvs/irspy -# -# This file can be included in the Apache configuration by adding a -# line like this to apache.conf or one of its included files: -# Include /usr/local/src/cvs/irspy/web/conf/apache1.3/test.conf -# -# When running on Debian, don't forget to -# install libapache-request-perl as well as libhtml-mason-perl, -# otherwise Mason will fail mysteriously. - - - ServerName irspy.indexdata.com - ErrorLog /var/log/apache/irspy-error.log - CustomLog /var/log/apache/irspy-access.log combined - DocumentRoot /usr/local/src/cvs/irspy/web/htdocs - - SetHandler perl-script - PerlHandler HTML::Mason::ApacheHandler - - PerlAddVar MasonCompRoot "private => /usr/local/src/cvs/irspy/web/htdocs" - PerlSetVar MasonDataDir /usr/local/src/cvs/irspy/web/data - PerlSetVar IRSpyLibDir /usr/local/src/cvs/irspy/lib - PerlSetEnv PERL5LIB /usr/local/src/cvs/irspy/lib - - AuthType Basic - AuthName "IRSpy Administration" - AuthUserFile /usr/local/src/cvs/irspy/web/conf/htpasswd - Require user admin - - diff --git a/web/conf/apache1.3/xeno.conf b/web/conf/apache1.3/xeno.conf deleted file mode 100644 index 7391a84..0000000 --- a/web/conf/apache1.3/xeno.conf +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: xeno.conf,v 1.9 2008-08-29 18:58:13 mike Exp $ -# -# Sample configuration for running an IRSpy web-site under Apache 1.3. -# -# This is the configuration that I use on the development machine, -# xeno, which is a Fujitu-Siemens SCENIC X102 PC running Ubuntu Linux -# release 6.06. On this machine, the IRSpy software is at -# /usr/local/src/cvs/irspy -# -# This file can be included in the Apache configuration by adding a -# line like this to apache.conf or one of its included files: -# Include /usr/local/src/cvs/irspy/web/conf/apache1.3/xeno.conf -# -# When running on Ubuntu (and probably Debian), don't forget to -# install libapache-request-perl as well as libhtml-mason-perl, -# otherwise Mason will fail mysteriously. - -NameVirtualHost 192.168.1.75 - - - ServerName x.irspy.indexdata.com - ErrorLog /var/log/apache/irspy-error.log - CustomLog /var/log/apache/irspy-access.log combined - DocumentRoot /usr/local/src/cvs/irspy/web/htdocs - - SetHandler perl-script - PerlHandler HTML::Mason::ApacheHandler - - PerlAddVar MasonCompRoot "private => /usr/local/src/cvs/irspy/web/htdocs" - PerlSetVar MasonDataDir /usr/local/src/cvs/irspy/web/data - PerlSetVar IRSpyLibDir /usr/local/src/cvs/irspy/lib - PerlSetEnv PERL5LIB /usr/local/src/cvs/irspy/lib - - AuthType Basic - AuthName "IRSpy Administration" - AuthUserFile /usr/local/src/cvs/irspy/web/conf/htpasswd - Require user admin - - diff --git a/web/conf/apache2.0/cfspy.conf b/web/conf/apache2.0/cfspy.conf deleted file mode 100644 index 10d4622..0000000 --- a/web/conf/apache2.0/cfspy.conf +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: cfspy.conf,v 1.4 2009-04-16 18:31:20 wosch Exp $ -# -# Sample configuration for running an IRSpy web-site under Apache 2.x. -# -# This is the configuration that I use on the development machine us2 -# /home/wosch/indexdata/irspy -# -# This file can be included in the Apache configuration by adding a -# line like this to apache.conf or one of its included files: -# Include /home/wosch/indexdata/irspy/web/conf/apache2.0/cfspy.conf -# -# When running on Ubuntu (and probably Debian), don't forget to -# install libapache-request-perl as well as libhtml-mason-perl, -# otherwise Mason will fail mysteriously. -# -# For Apache 2.x -# sudo apt-get install libxml-libxslt-perl -# sudo apt-get install libhtml-mason-perl -# sudo apt-get install libapache2-request-perl - -#NameVirtualHost 192.168.1.75 - - - ServerName cfspy.indexdata.com - - ErrorLog /var/log/apache2/cfspy-error.log - CustomLog /var/log/apache2/cfspy-access.log combined - DocumentRoot /home/wosch/indexdata/irspy/web/htdocs - - SetHandler perl-script - PerlHandler HTML::Mason::ApacheHandler - - - PerlSetVar MasonArgsMethod mod_perl - - PerlAddVar MasonCompRoot "private => /home/wosch/indexdata/irspy/web/htdocs" - PerlSetVar MasonDataDir /home/wosch/indexdata/irspy/web/data - PerlSetVar IRSpyLibDir /home/wosch/indexdata/irspy/lib - PerlSetEnv PERL5LIB /home/wosch/indexdata/irspy/lib - - # We need +Parent to make PerlSwitches -I work properly ... don't ask. - PerlOptions +Parent - PerlSwitches -I/home/wosch/indexdata/irspy/lib - - - AuthType Basic - AuthName "IRSpy Administration" - AuthUserFile /home/wosch/indexdata/irspy/web/conf/htpasswd - Require user admin - - - diff --git a/web/conf/apache2.0/irspy.conf b/web/conf/apache2.0/irspy.conf new file mode 100644 index 0000000..d7bc973 --- /dev/null +++ b/web/conf/apache2.0/irspy.conf @@ -0,0 +1,45 @@ +# $Id: cfspy.conf,v 1.4 2009-04-16 18:31:20 wosch Exp $ +# +# Sample configuration for running an IRSpy web-site under Apache 2.x. +# +# This is the configuration that I use on the development machine +# /usr/local/src/git/irspy +# +# This file can be included in the Apache configuration by adding a +# line like this to apache.conf or one of its included files: +# Include /usr/local/src/git/irspy/web/conf/apache2.0/irspy.conf +# +# For debian & unbuntu: please read irspy/README for a list of depending packages +# + + + ServerName irspy.indexdata.com + ServerAlias irspy2.indexdata.com irspy + + ErrorLog /var/log/apache2/irspy-error.log + CustomLog /var/log/apache2/irspy-access.log combined + DocumentRoot /usr/local/src/git/irspy/web/htdocs + + SetHandler perl-script + PerlHandler HTML::Mason::ApacheHandler + + + PerlSetVar MasonArgsMethod mod_perl + + PerlAddVar MasonCompRoot "private => /usr/local/src/git/irspy/web/htdocs" + PerlSetVar MasonDataDir /usr/local/src/git/irspy/web/data + PerlSetVar IRSpyLibDir /usr/local/src/git/irspy/lib + PerlSetEnv PERL5LIB /usr/local/src/git/irspy/lib + + # We need +Parent to make PerlSwitches -I work properly ... don't ask. + PerlOptions +Parent + PerlSwitches -I/usr/local/src/git/irspy/lib + + + AuthType Basic + AuthName "IRSpy Administration" + AuthUserFile /usr/local/src/git/irspy/web/conf/htpasswd + Require user admin + + + diff --git a/zebra/Makefile b/zebra/Makefile index 481a125..09602b3 100644 --- a/zebra/Makefile +++ b/zebra/Makefile @@ -1,4 +1,9 @@ -# $Id: Makefile,v 1.4 2007-09-13 12:19:58 mike Exp $ + +IRSPY_ARCHIVE= records-2007-05-01 +IRSPY_ARCHIVE_EXT= .tar.gz + +all: help + test: xmllint --noout --schema zeerex-2.0.xsd zeerex.xml @@ -7,12 +12,18 @@ terse.properties: pqf.properties sed -n 's/#.*//; s/[ ]*//; s/[ ][ ]*/ /g; /./p' $? > $@ newdb: - tar xzf records-2007-05-01.tar.gz + tar xzf ${IRSPY_ARCHIVE} zebraidx-2.0 init zebraidx-2.0 update zeerex.xml - zebraidx-2.0 update records-2007-05-01 + zebraidx-2.0 update ${IRSPY_ARCHIVE} zebraidx-2.0 commit clean: rm -f terse.properties +distclean: clean + rm -rf ${IRSPY_ARCHIVE} + +help: + @echo "make [ test | newdb | clean | distclean ]" + diff --git a/zebra/init-script b/zebra/init-script index 4f9b223..db71a91 100755 --- a/zebra/init-script +++ b/zebra/init-script @@ -1,6 +1,5 @@ #! /bin/sh -# $Id: init-script,v 1.8 2009-04-15 18:16:46 wosch Exp $ # # This is a startup/shutdown script for IRSpy's Zebra server, suitable # for use in a SysV-style init directory such as /etc/init.d (on @@ -19,10 +18,10 @@ logfile=/var/log/irspy-zebra pidfile=/var/run/irspy-zebra.pid case "`hostname`" in - xeno|rafa|test) IRSPYDIR=/usr/local/src/cvs/irspy/;; + nigiri | xeno | rafa | test) IRSPYDIR=/usr/local/src/cvs/irspy/;; shawarma|kafta) IRSPYDIR=/home/mike/cvs/irspy/;; - us2| us2.*) - IRSPYDIR=/home/wosch/indexdata/irspy/ + your-development-machine ) + IRSPYDIR=/home/foobar/indexdata/irspy/ logfile=$IRSPYDIR/irspy-zebra pidfile=$IRSPYDIR/irspy-zebra.pid ;; @@ -60,3 +59,4 @@ case "$1" in echo "Usage: $0 start|stop|restart" >&2 ;; esac +