[interchange-cvs] interchange - racke modified 5 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Wed Jun 4 12:42:26 UTC 2008
User: racke
Date: 2008-06-04 12:42:26 GMT
Modified: debian Tag: STABLE_5_6-branch interchange.templates
Modified: interchange.postinst interchange.config changelog
Modified: . Tag: STABLE_5_6-branch README.debian
Log:
remove SOAP questions from Debconf
Revision Changes Path
No revision
No revision
2.12.2.1 interchange/debian/interchange.templates
rev 2.12.2.1, prev_rev 2.12
Index: interchange.templates
===================================================================
RCS file: /var/cvs/interchange/debian/interchange.templates,v
retrieving revision 2.12
retrieving revision 2.12.2.1
diff -u -r2.12 -r2.12.2.1
--- interchange.templates 2 Jan 2008 09:21:49 -0000 2.12
+++ interchange.templates 4 Jun 2008 12:42:26 -0000 2.12.2.1
@@ -84,19 +84,6 @@
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: Enable the SOAP server?
- This setting determines if the SOAP server is started or not.
-
Template: interchange/robots
Type: boolean
Default: true
2.27.2.1 interchange/debian/interchange.postinst
rev 2.27.2.1, prev_rev 2.27
Index: interchange.postinst
===================================================================
RCS file: /var/cvs/interchange/debian/interchange.postinst,v
retrieving revision 2.27
retrieving revision 2.27.2.1
diff -u -r2.27 -r2.27.2.1
--- interchange.postinst 2 Jan 2008 09:21:49 -0000 2.27
+++ interchange.postinst 4 Jun 2008 12:42:26 -0000 2.27.2.1
@@ -96,18 +96,10 @@
else
FULL_URL=0
fi
-db_get interchange/cansoap
-SOAP=0
-if [ "$RET" = true ]; then
- db_get interchange/soap
- if [ "$RET" = true ]; then
- SOAP=1
- fi
-fi
db_get interchange/traffic
TRAFFIC="$RET"
-/usr/sbin/interchangeconfig FULL_URL=$FULL_URL SOAP=$SOAP TRAFFIC=$RET
+/usr/sbin/interchangeconfig FULL_URL=$FULL_URL TRAFFIC=$RET
# Make configuration files owned by the interchange user
chown -R $USER.$GROUP /etc/interchange
2.14.2.1 interchange/debian/interchange.config
rev 2.14.2.1, prev_rev 2.14
Index: interchange.config
===================================================================
RCS file: /var/cvs/interchange/debian/interchange.config,v
retrieving revision 2.14
retrieving revision 2.14.2.1
diff -u -r2.14 -r2.14.2.1
--- interchange.config 2 Jan 2008 09:21:49 -0000 2.14
+++ interchange.config 4 Jun 2008 12:42:26 -0000 2.14.2.1
@@ -1,6 +1,6 @@
#! /bin/sh -e
#
-# Copyright 2000,2001,2002,2003,2004,2005,2007 by Stefan Hornburg (Racke) <racke at linuxia.de>
+# Copyright 2000,2001,2002,2003,2004,2005,2007,2008 by Stefan Hornburg (Racke) <racke at 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
@@ -140,9 +140,6 @@
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
@@ -154,14 +151,6 @@
db_input low interchange/full_url || [ $? -eq 30 ]
db_go
-# SOAP server
-if /usr/bin/perl -MSOAP::Lite -e '' 2>/dev/null; then
- db_set interchange/cansoap true
- db_input low interchange/soap || [ $? -eq 30 ]
-else
- db_input low interchange/cansoap || [ $? -eq 30 ]
-fi
-
# Inclusion of robots directives
db_input low interchange/robots || [ $? -eq 30 ]
db_go
2.95.2.5 interchange/debian/changelog
rev 2.95.2.5, prev_rev 2.95.2.4
Index: changelog
===================================================================
RCS file: /var/cvs/interchange/debian/changelog,v
retrieving revision 2.95.2.4
retrieving revision 2.95.2.5
diff -u -r2.95.2.4 -r2.95.2.5
--- changelog 4 Jun 2008 12:22:48 -0000 2.95.2.4
+++ changelog 4 Jun 2008 12:42:26 -0000 2.95.2.5
@@ -10,10 +10,12 @@
- added defaults for database name and database user
* added Dutch translation of Debconf templates (Closes: #474696,
thanks to Bart Cornelis <cobaco at skolelinux.no>)
+ * Debconf
+ - use colon style
+ - remove SOAP questions
* don't care about Apache 1 anymore
* fix error in German translation of Debconf templates
* use type error for wrong Debconf input
- * use colon style for Debconf questions
* fixed POD error in interchangeconfig script
* lintian fixes
- fix section in interchangeconfig/te manual pages
No revision
No revision
2.12.2.1 interchange/README.debian
rev 2.12.2.1, prev_rev 2.12
Index: README.debian
===================================================================
RCS file: /var/cvs/interchange/README.debian,v
retrieving revision 2.12
retrieving revision 2.12.2.1
diff -u -r2.12 -r2.12.2.1
--- README.debian 13 Jun 2007 13:18:34 -0000 2.12
+++ README.debian 4 Jun 2008 12:42:26 -0000 2.12.2.1
@@ -37,6 +37,16 @@
For the administration of the standard demo (interchange-cat-standard
package) a secure webserver (https://) is required.
+SOAP
+====
+
+The Interchange SOAP server is disabled by default. Run the following
+commands to activate the SOAP server:
+
+apt-get install libsoap-lite-perl
+interchangeconfig SOAP=1
+/etc/init.d/interchange restart
+
Other Notes
===========
More information about the interchange-cvs
mailing list