[interchange-cvs] interchange - racke modified 4 files

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Wed Apr 9 21:01:00 2003


User:      racke
Date:      2003-04-10 01:00:40 GMT
Modified:  debian   interchange.conffiles interchange.config
Modified:           interchange.templates interchangeconfig
Log:
robots and soap debconf options added

Revision  Changes    Path
2.1       +1 -0      interchange/debian/interchange.conffiles


rev 2.1, prev_rev 2.0
Index: interchange.conffiles
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange.conffiles,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -r2.0 -r2.1
--- interchange.conffiles	18 Jul 2001 02:20:38 -0000	2.0
+++ interchange.conffiles	10 Apr 2003 01:00:40 -0000	2.1
@@ -2,5 +2,6 @@
 /etc/interchange/catalogs.cfg
 /etc/interchange/interchange.cfg
 /etc/interchange/makecat.cfg
+/etc/interchange/robots.cfg
 /etc/init.d/interchange
 /etc/logrotate.d/interchange



2.6       +17 -1     interchange/debian/interchange.config


rev 2.6, prev_rev 2.5
Index: interchange.config
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange.config,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -r2.5 -r2.6
--- interchange.config	7 Apr 2003 12:12:12 -0000	2.5
+++ interchange.config	10 Apr 2003 01:00:40 -0000	2.6
@@ -134,6 +134,12 @@
 			if [ "$name" = "FULL_URL" ]; then				
 				db_set interchange/full_url $FLAG
 			fi
+			if [ "$name" = "ROBOTS" ]; then
+				db_set interchange/robots $FLAG
+			fi
+			if [ "$name" = "SOAP" ]; then
+				db_set interchange/soap $FLAG
+			fi
 			if [ "$name" = "TRAFFIC" ]; then
 				db_set interchange/traffic $value
 			fi
@@ -141,16 +147,26 @@
 	done
 fi
 
+# FullURL directive
 db_input low interchange/full_url || true
 db_go
 
-if /usr/bin/perl -MSOAP::Lite -e 'print $SOAP::Lite::VERSION' >/dev/null 2>/dev/null; then
+# SOAP server
+if /usr/bin/perl -MSOAP::Lite -e '' 2>/dev/null; then
 	db_input low interchange/soap || true
+else
+	db_input low interchange/cansoap || true
 fi
 
+# Inclusion of robots directives
+db_input low interchange/robots || true
+db_go
+
+# Traffic mode
 db_input medium interchange/traffic || true
 db_go
 
+# Debugging support
 db_input low interchange/debug || true
 db_go
 



2.4       +22 -0     interchange/debian/interchange.templates


rev 2.4, prev_rev 2.3
Index: interchange.templates
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange.templates,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- interchange.templates	4 Apr 2003 17:01:34 -0000	2.3
+++ interchange.templates	10 Apr 2003 01:00:40 -0000	2.4
@@ -87,3 +87,25 @@
 Description: Whether to enable the FullURL directive or not
  This setting determines if the whole URL is considered while checking
  for the corresponding catalog.
+
+Template: interchange/cansoap
+Type: note
+Description: SOAP server not available
+ Because the Perl module SOAP::Lite is not installed, you are unable
+ to run the Interchange SOAP server. To change this, install the
+ libsoap-lite-perl Debian package and run interchangeconfig SOAP=1.
+
+Template: interchange/soap
+Type: boolean
+Default: false
+Description: Whether to enable the SOAP server or not
+ This setting determines if the SOAP server is started or not.
+
+Template: interchange/robots
+Type: boolean
+Default: true
+Description: Whether to enable robots settings or not
+ The Interchange Debian package uses a separate configuration file
+ /etc/interchange/robots.cfg for the directives RobotUA, RobotIP
+ and RobotHost. It is recommended to include these settings so
+ Interchange can distinguish between robots and ordinary users.



2.10      +2 -1      interchange/debian/interchangeconfig


rev 2.10, prev_rev 2.9
Index: interchangeconfig
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchangeconfig,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -r2.9 -r2.10
--- interchangeconfig	4 Apr 2003 17:01:34 -0000	2.9
+++ interchangeconfig	10 Apr 2003 01:00:40 -0000	2.10
@@ -29,8 +29,9 @@
 my $settingsconf = '/etc/interchange/settings.cfg';
 
 # Interchange variables
-my %setvars = (DEBUG => 0, FULL_URL => 0,
+my %setvars = (DEBUG => 0, FULL_URL => 0, ROBOTS => 0, SOAP => 0,
 			   TRAFFIC => 'low', UI_LOCALE => 'en_US');
+my %requires = (SOAP => ['SOAP::Lite']);
 my %featvars = (UI => '', USE_FOUNDATION => '');
 my %skipvars;