[interchange-cvs] interchange - racke modified 5 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Fri Apr 4 12:04:00 2003
User: racke
Date: 2003-04-04 17:01:34 GMT
Modified: debian interchange.cfg interchange.config
Modified: interchange.postinst interchange.templates
Modified: interchangeconfig
Log:
FullURL setting now configurable from debconf
Revision Changes Path
2.9 +16 -6 interchange/debian/interchange.cfg
rev 2.9, prev_rev 2.8
Index: interchange.cfg
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange.cfg,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -r2.8 -r2.9
--- interchange.cfg 14 Jan 2003 11:46:34 -0000 2.8
+++ interchange.cfg 4 Apr 2003 17:01:34 -0000 2.9
@@ -5,7 +5,7 @@
#========================================================================#
-# These settings (DEBUG, TRAFFIC, UI, UI_LOCALE) all affect
+# These settings (DEBUG, FULL_URL, SOAP, TRAFFIC, UI, UI_LOCALE) all affect
# other configuration directives below.
#
# We read them from /etc/interchange/features.cfg resp.
@@ -13,11 +13,13 @@
# manually (not recommended), with /usr/sbin/interchangeconfig
# or dpkg-reconfigure.
#
-# DEBUG: Set to 1 to send extra debugging info to file
-# /var/log/interchange/debug.log and get a dump of global
-# and catalog data structures.
-# TRAFFIC: Set to "low", "high", or "rpc" to get different server parameters.
-# UI: Set to 1 to include back-end administration interface.
+# DEBUG: Set to 1 to send extra debugging info to file
+# /var/log/interchange/debug.log and get a dump of global
+# and catalog data structures.
+# FULL_URL: Set to 1 for enabling the FullURL configuration directive.
+# SOAP: Set to 1 for enabling the SOAP server.
+# TRAFFIC: Set to "low", "high", or "rpc" to get different server parameters.
+# UI: Set to 1 to include back-end administration interface.
include /usr/lib/interchange/VERSION
include /etc/interchange/features.cfg
@@ -32,6 +34,14 @@
# This directive affects the entire global configuration, so check any
# files you include if you're upgrading.
# ConfigParseComments No
+
+#========================================================================#
+
+# Whether to consider the whole URL for determining the catalog or not
+
+ifdef @FULL_URL
+FullURL Yes
+endif
#========================================================================#
2.4 +6 -0 interchange/debian/interchange.config
rev 2.4, prev_rev 2.3
Index: interchange.config
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange.config,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- interchange.config 14 Jan 2003 11:46:34 -0000 2.3
+++ interchange.config 4 Apr 2003 17:01:34 -0000 2.4
@@ -131,12 +131,18 @@
if [ "$name" = "DEBUG" ]; then
db_set interchange/debug $FLAG
fi
+ if [ "$name" = "FULL_URL" ]; then
+ db_set interchange/full_url $FLAG
+ fi
if [ "$name" = "TRAFFIC" ]; then
db_set interchange/traffic $value
fi
fi
done
fi
+
+db_input low interchange/full_url || true
+db_go
db_input medium interchange/traffic || true
db_go
2.14 +7 -1 interchange/debian/interchange.postinst
rev 2.14, prev_rev 2.13
Index: interchange.postinst
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange.postinst,v
retrieving revision 2.13
retrieving revision 2.14
diff -u -r2.13 -r2.14
--- interchange.postinst 14 Jan 2003 22:38:39 -0000 2.13
+++ interchange.postinst 4 Apr 2003 17:01:34 -0000 2.14
@@ -96,9 +96,15 @@
else
DEBUG=0
fi
+db_get interchange/full_url
+if [ "$RET" = true ]; then
+ FULL_URL=1
+else
+ FULL_URL=0
+fi
db_get interchange/traffic
TRAFFIC="$RET"
-/usr/sbin/interchangeconfig DEBUG=$DEBUG TRAFFIC=$RET
+/usr/sbin/interchangeconfig DEBUG=$DEBUG FULL_URL=$FULL_URL TRAFFIC=$RET
# Make configuration files owned by the interchange user
chown -R $USER.$GROUP /etc/interchange
2.3 +7 -0 interchange/debian/interchange.templates
rev 2.3, prev_rev 2.2
Index: interchange.templates
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange.templates,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- interchange.templates 14 Jan 2003 11:46:34 -0000 2.2
+++ interchange.templates 4 Apr 2003 17:01:34 -0000 2.3
@@ -80,3 +80,10 @@
You can choose different sets of server parameters. Any store based on
the foundation demo will change its behaviour too. If rpc is selected,
the Interchange server will run in PreFork mode.
+
+Template: interchange/full_url
+Type: boolean
+Default: false
+Description: Whether to enable the FullURL directive or not
+ This setting determines if the whole URL is considered while checking
+ for the corresponding catalog.
2.9 +2 -1 interchange/debian/interchangeconfig
rev 2.9, prev_rev 2.8
Index: interchangeconfig
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchangeconfig,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -r2.8 -r2.9
--- interchangeconfig 14 Jan 2003 11:46:34 -0000 2.8
+++ interchangeconfig 4 Apr 2003 17:01:34 -0000 2.9
@@ -29,7 +29,8 @@
my $settingsconf = '/etc/interchange/settings.cfg';
# Interchange variables
-my %setvars = (DEBUG => 0, TRAFFIC => 'low', UI_LOCALE => 'en_US');
+my %setvars = (DEBUG => 0, FULL_URL => 0,
+ TRAFFIC => 'low', UI_LOCALE => 'en_US');
my %featvars = (UI => '', USE_FOUNDATION => '');
my %skipvars;