[interchange-cvs] interchange - racke modified 7 files

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Tue Jan 14 06:47:01 2003


User:      racke
Date:      2003-01-14 11:46:34 GMT
Modified:  .        WHATSNEW
Modified:  debian   changelog interchange.cfg interchange.config
Modified:           interchange.postinst interchange.templates
Modified:           interchangeconfig
Log:
Default traffic setting is low now.
Allow selection of traffic setting with debconf and interchangeconfig.

Revision  Changes    Path
2.83      +12 -0     interchange/WHATSNEW


rev 2.83, prev_rev 2.82
Index: WHATSNEW
===================================================================
RCS file: /anon_cvs/repository/interchange/WHATSNEW,v
retrieving revision 2.82
retrieving revision 2.83
diff -u -r2.82 -r2.83
--- WHATSNEW	14 Jan 2003 02:25:49 -0000	2.82
+++ WHATSNEW	14 Jan 2003 11:46:34 -0000	2.83
@@ -7,6 +7,18 @@
 
 Interchange 4.9.7 not yet released
 
+
+Debian
+------
+
+* Default traffic setting is low now.
+
+* Allow selection of traffic setting with debconf and interchangeconfig.
+
+
+------------------------------------------------------------------------------
+
+
 Interchange 4.9.6, released 8-Jan-2003.
 
 



2.26      +1 -0      interchange/debian/changelog


rev 2.26, prev_rev 2.25
Index: changelog
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/changelog,v
retrieving revision 2.25
retrieving revision 2.26
diff -u -r2.25 -r2.26
--- changelog	14 Jan 2003 11:03:02 -0000	2.25
+++ changelog	14 Jan 2003 11:46:34 -0000	2.26
@@ -1,6 +1,7 @@
 interchange (4.9.7-1) unstable; urgency=low
 
   * new upstream release
+  * new debconf option for traffic, use low traffic as default
   * UPGRADE and README.cvs added to interchange.docs
   * new debconf option for GnuPG home directory
   



2.8       +7 -10     interchange/debian/interchange.cfg


rev 2.8, prev_rev 2.7
Index: interchange.cfg
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange.cfg,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -r2.7 -r2.8
--- interchange.cfg	16 Dec 2002 18:03:38 -0000	2.7
+++ interchange.cfg	14 Jan 2003 11:46:34 -0000	2.8
@@ -5,22 +5,19 @@
 
 #========================================================================#
 
-# These settings (DEBUG, UI, UI_LOCALE) all affect
+# These settings (DEBUG, TRAFFIC, UI, UI_LOCALE) all affect
 # other configuration directives below.
 #
-# UI: Set to 1 to include back-end administration interface.
-#
 # We read them from /etc/interchange/features.cfg resp.
 # /etc/interchange/settings.cfg. You may modify the latter file
 # manually (not recommended), with /usr/sbin/interchangeconfig
 # or dpkg-reconfigure.
-
-# Set to "low", "high", or "rpc" to get different server parameters.
-Variable  TRAFFIC  rpc
-
-# 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.
-#Variable  DEBUG  1
+#
+# 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.
 
 include /usr/lib/interchange/VERSION
 include /etc/interchange/features.cfg



2.3       +7 -1      interchange/debian/interchange.config


rev 2.3, prev_rev 2.2
Index: interchange.config
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange.config,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- interchange.config	30 Dec 2002 00:44:39 -0000	2.2
+++ interchange.config	14 Jan 2003 11:46:34 -0000	2.3
@@ -1,6 +1,6 @@
 #! /bin/sh -e
 #
-# Copyright 2000,2001,2002 by Stefan Hornburg (Racke) <racke@linuxia.de>
+# Copyright 2000,2001,2002,2003 by Stefan Hornburg (Racke) <racke@linuxia.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -131,9 +131,15 @@
 			if [ "$name" = "DEBUG" ]; then				
 				db_set interchange/debug $FLAG
 			fi
+			if [ "$name" = "TRAFFIC" ]; then
+				db_set interchange/traffic $value
+			fi
 		fi
 	done
 fi
+
+db_input medium interchange/traffic || true
+db_go
 
 db_input low interchange/debug || true
 db_go



2.12      +3 -1      interchange/debian/interchange.postinst


rev 2.12, prev_rev 2.11
Index: interchange.postinst
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange.postinst,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -r2.11 -r2.12
--- interchange.postinst	30 Dec 2002 00:44:39 -0000	2.11
+++ interchange.postinst	14 Jan 2003 11:46:34 -0000	2.12
@@ -96,7 +96,9 @@
 else
 	DEBUG=0
 fi
-/usr/sbin/interchangeconfig DEBUG=$DEBUG
+db_get interchange/traffic
+TRAFFIC="$RET"
+/usr/sbin/interchangeconfig DEBUG=$DEBUG TRAFFIC=$RET
 
 # Make configuration files owned by the interchange user
 chown -R $USER.$GROUP /etc/interchange



2.2       +9 -0      interchange/debian/interchange.templates


rev 2.2, prev_rev 2.1
Index: interchange.templates
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange.templates,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- interchange.templates	30 Dec 2002 00:44:39 -0000	2.1
+++ interchange.templates	14 Jan 2003 11:46:34 -0000	2.2
@@ -71,3 +71,12 @@
  will be encrypted and mailed to the shop owner instead of storing it
  on the server. Please choose the directory Interchange uses for the
  GnuPG public keyring.
+
+Template: interchange/traffic
+Type: select
+Choices: low, high, rpc
+Default: low
+Description: Selects set of server parameters
+ 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.



2.8       +4 -3      interchange/debian/interchangeconfig


rev 2.8, prev_rev 2.7
Index: interchangeconfig
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchangeconfig,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -r2.7 -r2.8
--- interchangeconfig	12 Aug 2001 21:23:09 -0000	2.7
+++ interchangeconfig	14 Jan 2003 11:46:34 -0000	2.8
@@ -1,6 +1,6 @@
-#! /usr/bin/perl -w
+#! /usr/bin/perl
 #
-# Copyright 2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+# Copyright 2001,2003 by Stefan Hornburg (Racke) <racke@linuxia.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 # MA  02111-1307  USA.
 
 use strict;
+use warnings;
 
 # constants we use
 my $lock_ex = 2;
@@ -28,7 +29,7 @@
 my $settingsconf = '/etc/interchange/settings.cfg';
 
 # Interchange variables
-my %setvars = (DEBUG => 0, UI_LOCALE => 'en_US');
+my %setvars = (DEBUG => 0, TRAFFIC => 'low', UI_LOCALE => 'en_US');
 my %featvars = (UI => '', USE_FOUNDATION => '');
 my %skipvars;