[interchange-cvs] interchange - racke modified 3 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Tue May 3 10:59:41 EDT 2005
User: racke
Date: 2005-05-03 14:59:41 GMT
Modified: debian interchange-cat-standard.config
Modified: interchange-cat-standard.postinst
Modified: interchange-cat-standard.templates
Log:
consider FullURL setting for demo catalog
Revision Changes Path
2.4 +8 -0 interchange/debian/interchange-cat-standard.config
rev 2.4, prev_rev 2.3
Index: interchange-cat-standard.config
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange-cat-standard.config,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- interchange-cat-standard.config 12 Jan 2005 22:02:00 -0000 2.3
+++ interchange-cat-standard.config 3 May 2005 14:59:41 -0000 2.4
@@ -52,6 +52,14 @@
db_input medium interchange-cat-standard/purge || [ $? -eq 30 ]
db_go
+# web parameters
+db_get interchange/full_url
+if [ "$RET" = "true" ]; then
+ db_set interchange-cat-standard/vhost `hostname --fqdn`
+ db_input medium interchange-cat-standard/vhost || [ $? -eq 30 ]
+ db_go
+fi
+
# database parameters
db_input high interchange-cat-standard/dbtype || [ $? -eq 30 ]
db_go
2.5 +9 -2 interchange/debian/interchange-cat-standard.postinst
rev 2.5, prev_rev 2.4
Index: interchange-cat-standard.postinst
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange-cat-standard.postinst,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -r2.4 -r2.5
--- interchange-cat-standard.postinst 29 Jan 2005 13:59:00 -0000 2.4
+++ interchange-cat-standard.postinst 3 May 2005 14:59:41 -0000 2.5
@@ -123,14 +123,21 @@
db_get interchange-cat-standard/install
if [ "$RET" = "true" ]; then
+ db_get interchange/full_url
+ if [ "$RET" = "true" ]; then
+ db_get interchange-cat-standard/vhost
+ URLS="$RET/cgi-bin/ic/standard $RET:443/cgi-bin/ic/standard"
+ else
+ URLS="/cgi-bin/ic/standard"
+ fi
cat <<EOF >/var/lib/interchange/catalog.d/interchange-cat-standard.cfg
include usertag/standard/*
require module Vend::Payment::TestPayment
-Catalog standard /var/lib/interchange/catalogs/standard /cgi-bin/ic/standard
+Catalog standard /var/lib/interchange/catalogs/standard $URLS
EOF
if [ ! -f /var/run/interchange-install ]; then
# add catalog to running server
- echo 'Catalog standard /var/lib/interchange/catalogs/standard /cgi-bin/ic/standard' | /usr/sbin/interchange --add standard
+ echo "Catalog standard /var/lib/interchange/catalogs/standard $URLS" | /usr/sbin/interchange --add standard
fi
fi
2.4 +6 -0 interchange/debian/interchange-cat-standard.templates
rev 2.4, prev_rev 2.3
Index: interchange-cat-standard.templates
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange-cat-standard.templates,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- interchange-cat-standard.templates 12 Jan 2005 22:02:00 -0000 2.3
+++ interchange-cat-standard.templates 3 May 2005 14:59:41 -0000 2.4
@@ -26,6 +26,12 @@
_Description: Replace the Interchange demo catalog?
There seems to already exist an Interchange demo catalog.
+Template: interchange-cat-standard/vhost
+Type: string
+Default:
+_Description: Virtual host for the demo catalog ?
+ You are running Interchange with "FullURL" enabled. Please specify the virtual host for the demo catalog.
+
Template: interchange-cat-standard/username
Type: string
Default: interchange
More information about the interchange-cvs
mailing list