[Webapps-common-discuss] [commit] r116 - in webapps-common/trunk: dpkg examples/webapp-apache-dbapp-example/debian

[seanius at alioth.debian.org]

Author: seanius
Date: 2007-06-22 16:02:19 +0000 (Fri, 22 Jun 2007)
New Revision: 116

Modified:
   webapps-common/trunk/dpkg/common
   webapps-common/trunk/dpkg/config
   webapps-common/trunk/dpkg/postinst
   webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/postrm
   webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/rules
Log:
few bugfixes, in w-c and examples

Modified: webapps-common/trunk/dpkg/common
===================================================================
--- webapps-common/trunk/dpkg/common	2007-06-22 13:09:52 UTC (rev 115)
+++ webapps-common/trunk/dpkg/common	2007-06-22 16:02:19 UTC (rev 116)
@@ -540,9 +540,10 @@
 ## XXX syntax for different dbtypes?
 ###
 wc_gen_unique_user(){
+	_wc_debug "wc_gen_unique_user $*"
 	local u
 	u=`echo $1 | dd bs=1 count=8 2>/dev/null`
-	u="${u}`wc_debian_siteid | dd bs=1 count=8 2>/dev/null`"
+	u="${u}`wc_debian_siteid $2 | dd bs=1 count=8 2>/dev/null`"
 	echo $u
 }
 
@@ -554,9 +555,10 @@
 ## XXX syntax for different dbtypes?
 ###
 wc_gen_unique_db(){
+	_wc_debug "wc_gen_unique_db $*"
 	local d
 	d=`echo $1 | tr -d +-. | dd bs=1 count=12 2>/dev/null`
-	d="${d}`wc_debian_siteid | dd bs=1 count=16 2>/dev/null`"
+	d="${d}`wc_debian_siteid $2 | dd bs=1 count=16 2>/dev/null`"
 	echo $d
 }
 

Modified: webapps-common/trunk/dpkg/config
===================================================================
--- webapps-common/trunk/dpkg/config	2007-06-22 13:09:52 UTC (rev 115)
+++ webapps-common/trunk/dpkg/config	2007-06-22 16:02:19 UTC (rev 116)
@@ -45,8 +45,8 @@
 		for i in `_wc_list_explode "$instances"`; do
 			_wc_debug "  $i"
 			dbc_package="${wc_package}_`wc_debian_siteid $i`"
-			dbc_dbuser=`wc_gen_unique_user $wc_package $i`
-			dbc_dbname=`wc_gen_unique_db $wc_package $i`
+			dbc_dbuser="`wc_gen_unique_user $wc_package $i`"
+			dbc_dbname="`wc_gen_unique_db $wc_package $i`"
 			if [ "$wc_dbtype" ]; then
 				. /usr/share/dbconfig-common/dpkg/config.$wc_dbtype
 			else

Modified: webapps-common/trunk/dpkg/postinst
===================================================================
--- webapps-common/trunk/dpkg/postinst	2007-06-22 13:09:52 UTC (rev 115)
+++ webapps-common/trunk/dpkg/postinst	2007-06-22 16:02:19 UTC (rev 116)
@@ -69,12 +69,12 @@
 				dbc_dbtypes="$wc_dbtypes"
 				. /usr/share/dbconfig-common/dpkg/postinst
 			fi
-			_wc_debug dbc_go $dbc_package $wc_command $wc_oldversion
 			if [ "$wc_generate_include" ]; then
 				dbc_generate_include=`wc_to_dbc_generate_include $i`
 				_wc_debug "dbc_generate_include: $dbc_generate_include"
 			fi
 			dbc_package="${wc_package}_`wc_debian_siteid $i`"
+			_wc_debug dbc_go $dbc_package $wc_command $wc_oldversion
 			dbc_go $dbc_package $wc_command $wc_oldversion
 		done
 	fi

Modified: webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/postrm
===================================================================
--- webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/postrm	2007-06-22 13:09:52 UTC (rev 115)
+++ webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/postrm	2007-06-22 16:02:19 UTC (rev 116)
@@ -4,7 +4,7 @@
 
 . /usr/share/debconf/confmodule
 . /usr/share/webapps-common/dpkg/postrm
-wc_dbapp="mysql"
+wc_dbtype="mysql"
 wc_go webapp-apache-dbapp-example $@
 
 if [ "$1" = "purge" ]; then

Modified: webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/rules
===================================================================
--- webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/rules	2007-06-22 13:09:52 UTC (rev 115)
+++ webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/rules	2007-06-22 16:02:19 UTC (rev 116)
@@ -42,6 +42,7 @@
 	dh_installdirs
 #	debian/credit-xlators > ${DOC}/TRANSLATORS
 	cp apache_template.conf ${INSTDIR}/apache_template
+	cp settings.php ${ptmp}/etc/$p/settings.php
 	cp bootstrap.sql ${DBINSTDIR}/mysql
 	cp index.php ${WEBDOCDIR}