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

[seanius at alioth.debian.org]

Author: seanius
Date: 2007-06-22 13:00:17 +0000 (Fri, 22 Jun 2007)
New Revision: 114

Added:
   webapps-common/trunk/examples/webapp-apache-dbapp-example/settings.php
Modified:
   webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/config
   webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/postinst
   webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/postrm
   webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/prerm
Log:
another chunk o work

Modified: webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/config
===================================================================
--- webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/config	2007-06-21 11:58:42 UTC (rev 113)
+++ webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/config	2007-06-22 13:00:17 UTC (rev 114)
@@ -4,7 +4,6 @@
 
 . /usr/share/debconf/confmodule
 . /usr/share/webapps-common/dpkg/config
-wc_dbapp="yes"
-wc_dbtype="mysql"
+wc_dbapp="yes:mysql"
 wc_multiple_instances="yes"
 wc_go webapp-apache-dbapp-example $@

Modified: webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/postinst
===================================================================
--- webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/postinst	2007-06-21 11:58:42 UTC (rev 113)
+++ webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/postinst	2007-06-22 13:00:17 UTC (rev 114)
@@ -4,9 +4,8 @@
 
 . /usr/share/debconf/confmodule
 . /usr/share/webapps-common/dpkg/postinst
-wc_dbapp="yes"
-wc_dbtype="mysql"
-wc_generate_include="php:/etc/webapp-apache-dbapp-example:settings-:php"
+wc_dbapp="yes:mysql"
+wc_generate_include="php:/etc/webapp-apache-dbapp-example/site-:php"
 dbc_generate_include_args="-O root:www-data -m 640"
 wc_go webapp-apache-dbapp-example $@
 

Modified: webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/postrm
===================================================================
--- webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/postrm	2007-06-21 11:58:42 UTC (rev 113)
+++ webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/postrm	2007-06-22 13:00:17 UTC (rev 114)
@@ -4,13 +4,16 @@
 
 . /usr/share/debconf/confmodule
 . /usr/share/webapps-common/dpkg/postrm
-wc_dbapp="yes"
-wc_dbtype="mysql"
+wc_dbapp="yes:mysql"
 wc_go webapp-apache-dbapp-example $@
 
 if [ "$1" = "purge" ]; then
 	rm -f /etc/webapp-apache-dbapp-example/settings.php
-	ucf --purge /etc/webapp-apache-dbapp-example/settings.php
+	ucf --purge /etc/webapp-apache-dbapp-example/settings.php || true
+	for f in /etc/webapp-apache-dbapp-example/site-*.php; do
+		rm -f $f
+		ucf --purge $f || true
+	done
 fi
 
 #DEBHELPER#

Modified: webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/prerm
===================================================================
--- webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/prerm	2007-06-21 11:58:42 UTC (rev 113)
+++ webapps-common/trunk/examples/webapp-apache-dbapp-example/debian/prerm	2007-06-22 13:00:17 UTC (rev 114)
@@ -4,8 +4,7 @@
 
 . /usr/share/debconf/confmodule
 . /usr/share/webapps-common/dpkg/prerm
-wc_dbapp="yes"
-wc_dbtype="mysql"
+wc_dbapp="yes:mysql"
 wc_go webapp-apache-dbapp-example $@
 
 #DEBHELPER#

Added: webapps-common/trunk/examples/webapp-apache-dbapp-example/settings.php
===================================================================
--- webapps-common/trunk/examples/webapp-apache-dbapp-example/settings.php	                        (rev 0)
+++ webapps-common/trunk/examples/webapp-apache-dbapp-example/settings.php	2007-06-22 13:00:17 UTC (rev 114)
@@ -0,0 +1,5 @@
+<?php
+
+require_once "/etc/webapp-apache-dbapp-example/site-$_SERVER[X_DEBIAN_SITEID].php";
+
+?>