[interchange/DEB_5_10_0] Another batch of standard to strap changes.

[Stefan Hornburg]

commit 777af873fec604bccd452a26c01f8b38a1af26b0
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Mon Apr 25 14:34:10 2016 +0200

    Another batch of standard to strap changes.

 debian/interchange-cat-strap.config    |    4 ++--
 debian/interchange-cat-strap.postinst  |   16 ++++++++--------
 debian/interchange-cat-strap.postrm    |    2 +-
 debian/interchange-cat-strap.prerm     |    2 +-
 debian/interchange-cat-strap.templates |    2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/debian/interchange-cat-strap.config b/debian/interchange-cat-strap.config
index a113a61..617e3cc 100644
--- a/debian/interchange-cat-strap.config
+++ b/debian/interchange-cat-strap.config
@@ -22,7 +22,7 @@
 
 # Set defaults for dbconfig-common
 dbc_dbtypes="sqlite, mysql, pgsql"
-dbc_dbname=interchange_standard
+dbc_dbname=interchange_strap
 dbc_dbuser=interchange
 
 # Source dbconfig-common stuff
@@ -42,7 +42,7 @@ db_input high interchange-cat-strap/replace || [ $? -eq 30 ]
 db_go
 
 GOAHEAD=false
-if [ -d /var/lib/interchange/catalogs/standard ]; then
+if [ -d /var/lib/interchange/catalogs/strap ]; then
 	db_get interchange-cat-strap/replace
 	if [ "$RET" = "ask" ]; then
 		db_fset interchange-cat-strap/confirm isdefault true
diff --git a/debian/interchange-cat-strap.postinst b/debian/interchange-cat-strap.postinst
index 5dad6cc..d8c134c 100755
--- a/debian/interchange-cat-strap.postinst
+++ b/debian/interchange-cat-strap.postinst
@@ -36,7 +36,7 @@ GROUP=$RET
 db_get interchange-cat-strap/install
 
 if [ "$RET" = "true" ]; then
-	CATALOG=standard
+	CATALOG=strap
 	if [ -d /var/lib/interchange/catalogs/$CATALOG ]; then
 		db_get interchange-cat-strap/replace
 		if [ "$RET" = "always" ]; then
@@ -60,7 +60,7 @@ if [ "$GOAHEAD" = "true" ]; then
 	BASEDIR=/var/lib/interchange/catalogs
 	CGIBASE=/cgi-bin/ic
 	DOCROOT="$RET"
-	CATALOG=standard
+	CATALOG=strap
 
 	# replace document root
 	if [ "$DOCROOT" -a -d "$DOCROOT" ]; then
@@ -106,7 +106,7 @@ if [ "$GOAHEAD" = "true" ]; then
 		SERVERNAME=`hostname --fqdn 2>/dev/null || echo localhost`
 	fi
 
-	MVC_ENABLESECURE=1 MVC_UISECURE=1 MVC_SUPERUSER="$UI_SUPERUSER" MVC_CRYPTPW="$UI_PASSWORD" MVC_LOCALES="$LOCALES" MVC_DEFAULTLOCALE="$DEFAULTLOCALE" MVC_SKIP_ADD_GLOBAL_USERTAG=1 MVC_SQLITE=1 MVC_MYSQL=$MYSQL MVC_PGSQL=$PGSQL /usr/bin/makecat \
+	MVC_ENABLESECURE=1 MVC_UISECURE=1 MVC_SUPERUSER="$UI_SUPERUSER" MVC_CRYPTPW="$UI_PASSWORD" MVC_CATALOGNAME="shops/strap" MVC_LOCALES="$LOCALES" MVC_DEFAULTLOCALE="$DEFAULTLOCALE" MVC_SKIP_ADD_GLOBAL_USERTAG=1 MVC_SQLITE=1 MVC_MYSQL=$MYSQL MVC_PGSQL=$PGSQL /usr/bin/makecat \
 		-F \
 		-l /var/log/interchange/makecat.log \
 		--demotype=$CATALOG \
@@ -144,18 +144,18 @@ if [ "$RET" = "true" ]; then
 	db_get interchange/full_url
 	if [ "$RET" = "true" ]; then
 		db_get interchange-cat-strap/vhost
-		URLS="$RET/cgi-bin/ic/standard $RET:443/cgi-bin/ic/standard"
+		URLS="$RET/cgi-bin/ic/strap $RET:443/cgi-bin/ic/strap"
 	else
-		URLS="/cgi-bin/ic/standard"
+		URLS="/cgi-bin/ic/strap"
 	fi
 	cat <<EOF >/var/lib/interchange/catalog.d/interchange-cat-strap.cfg
-include usertag/standard/*
+include usertag/strap/*
 require module Vend::Payment::TestPayment
-Catalog standard /var/lib/interchange/catalogs/standard $URLS
+Catalog strap /var/lib/interchange/catalogs/strap $URLS
 EOF
 	if [ ! -f /var/run/interchange-install ]; then
 		# add catalog to running server
-		echo "Catalog standard /var/lib/interchange/catalogs/standard $URLS" | interchange --add standard
+		echo "Catalog strap /var/lib/interchange/catalogs/strap $URLS" | interchange --add strap
 	fi
 fi
 
diff --git a/debian/interchange-cat-strap.postrm b/debian/interchange-cat-strap.postrm
index e0f53f9..a8f2663 100644
--- a/debian/interchange-cat-strap.postrm
+++ b/debian/interchange-cat-strap.postrm
@@ -31,7 +31,7 @@ if [ "$1" = "purge" ]; then
 	if [ "$RET" = "true" ]; then
 		db_get interchange-cat-strap/purge
 		if [ "$RET" = "true" ]; then
-			CATALOG=standard
+			CATALOG=strap
 			db_get interchange/docroot
 			DOCROOT=$RET
 			rm -rf /usr/lib/cgi-bin/ic/$CATALOG
diff --git a/debian/interchange-cat-strap.prerm b/debian/interchange-cat-strap.prerm
index 23977c6..21bb164 100755
--- a/debian/interchange-cat-strap.prerm
+++ b/debian/interchange-cat-strap.prerm
@@ -30,7 +30,7 @@ db_get interchange-cat-strap/install
 if [ "$RET" = "true" ]; then
 	if [ ! -f /var/run/interchange-install ]; then
 		# remove catalog from running server
-		interchange --remove=standard || true
+		interchange --remove=strap || true
 		rm -f /var/lib/interchange/catalog.d/interchange-cat-strap.cfg
 	fi
 fi
diff --git a/debian/interchange-cat-strap.templates b/debian/interchange-cat-strap.templates
index 6a3c4ad..4b632d3 100644
--- a/debian/interchange-cat-strap.templates
+++ b/debian/interchange-cat-strap.templates
@@ -79,7 +79,7 @@ _Description: DBMS for the demo catalog:
 
 Template: interchange-cat-strap/dbname
 Type: string
-Default: standard
+Default: strap
 _Description: Database name:
  Please select the name of the database.