[Webapps-common-discuss] [commit] r81 - in trunk/examples: .
webapp-apache-dbapp-example webapp-apache-dbapp-example/debian
webapp-apache-example/debian webapp-apache-multihost-example
webapp-apache-multihost-example/debian
Sean Finney
seanius at costa.debian.org
Mon May 15 22:50:55 UTC 2006
Author: seanius
Date: 2006-05-15 22:50:51 +0000 (Mon, 15 May 2006)
New Revision: 81
Added:
trunk/examples/webapp-apache-dbapp-example/
trunk/examples/webapp-apache-dbapp-example/bootstrap.sql
trunk/examples/webapp-apache-dbapp-example/index.php
trunk/examples/webapp-apache-multihost-example/
Removed:
trunk/examples/webapp-apache-dbapp-example/index.html
Modified:
trunk/examples/buildpackages.sh
trunk/examples/webapp-apache-dbapp-example/apache_template.conf
trunk/examples/webapp-apache-dbapp-example/debian/changelog
trunk/examples/webapp-apache-dbapp-example/debian/config
trunk/examples/webapp-apache-dbapp-example/debian/control
trunk/examples/webapp-apache-dbapp-example/debian/dirs
trunk/examples/webapp-apache-dbapp-example/debian/postinst
trunk/examples/webapp-apache-dbapp-example/debian/postrm
trunk/examples/webapp-apache-dbapp-example/debian/prerm
trunk/examples/webapp-apache-dbapp-example/debian/rules
trunk/examples/webapp-apache-example/debian/config
trunk/examples/webapp-apache-example/debian/postinst
trunk/examples/webapp-apache-example/debian/prerm
trunk/examples/webapp-apache-multihost-example/apache_template.conf
trunk/examples/webapp-apache-multihost-example/debian/changelog
trunk/examples/webapp-apache-multihost-example/debian/config
trunk/examples/webapp-apache-multihost-example/debian/control
trunk/examples/webapp-apache-multihost-example/debian/dirs
trunk/examples/webapp-apache-multihost-example/debian/postinst
trunk/examples/webapp-apache-multihost-example/debian/postrm
trunk/examples/webapp-apache-multihost-example/debian/prerm
trunk/examples/webapp-apache-multihost-example/debian/rules
trunk/examples/webapp-apache-multihost-example/index.html
Log:
an afternoon of debconf hacking results in an initial version of
dbconfig-common support for single instance packages.
Modified: trunk/examples/buildpackages.sh
===================================================================
--- trunk/examples/buildpackages.sh 2006-05-14 22:43:07 UTC (rev 80)
+++ trunk/examples/buildpackages.sh 2006-05-15 22:50:51 UTC (rev 81)
@@ -1,6 +1,6 @@
#!/bin/sh
-packages="webapp-apache-example"
+packages="webapp-apache-example webapp-apache-multihost-example webapp-apache-dbapp-example"
nwd=`dirname $0`
cd $nwd
Copied: trunk/examples/webapp-apache-dbapp-example (from rev 79, trunk/examples/webapp-apache-example)
Modified: trunk/examples/webapp-apache-dbapp-example/apache_template.conf
===================================================================
--- trunk/examples/webapp-apache-example/apache_template.conf 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-dbapp-example/apache_template.conf 2006-05-15 22:50:51 UTC (rev 81)
@@ -11,6 +11,6 @@
# Where foo is the
_WC_DOCROOT_DIRECTIVE_
-<Directory /usr/share/webapp-apache-example/www>
+<Directory /usr/share/webapp-apache-dbapp-example/www>
# other stuff could be done here...
</Directory>
Added: trunk/examples/webapp-apache-dbapp-example/bootstrap.sql
===================================================================
--- trunk/examples/webapp-apache-example/bootstrap.sql 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-dbapp-example/bootstrap.sql 2006-05-15 22:50:51 UTC (rev 81)
@@ -0,0 +1,2 @@
+create table information ( id int, stuff text );
+insert into information values ( 1, "foo" ), ( 2, "bar" );
Modified: trunk/examples/webapp-apache-dbapp-example/debian/changelog
===================================================================
--- trunk/examples/webapp-apache-example/debian/changelog 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-dbapp-example/debian/changelog 2006-05-15 22:50:51 UTC (rev 81)
@@ -1,4 +1,4 @@
-webapp-apache-example (0.0) UNRELEASED; urgency=low
+webapp-apache-dbapp-example (0.0) UNRELEASED; urgency=low
* initial version.
Modified: trunk/examples/webapp-apache-dbapp-example/debian/config
===================================================================
--- trunk/examples/webapp-apache-example/debian/config 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-dbapp-example/debian/config 2006-05-15 22:50:51 UTC (rev 81)
@@ -4,5 +4,6 @@
. /usr/share/debconf/confmodule
. /usr/share/webapps-common/dpkg/config
-wc_apache_conf_style="template"
-wc_go webapp-apache-example $@
+wc_dbapp="yes"
+dbc_dbtype="mysql"
+wc_go webapp-apache-dbapp-example $@
Modified: trunk/examples/webapp-apache-dbapp-example/debian/control
===================================================================
--- trunk/examples/webapp-apache-example/debian/control 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-dbapp-example/debian/control 2006-05-15 22:50:51 UTC (rev 81)
@@ -1,11 +1,11 @@
-Source: webapp-apache-example
+Source: webapp-apache-dbapp-example
Section: admin
Priority: optional
Maintainer: sean finney <seanius at debian.org>
Build-Depends: debhelper (>= 4.0.0)
Standards-Version: 3.6.1
-Package: webapp-apache-example
+Package: webapp-apache-dbapp-example
Architecture: all
Depends: webapps-common, ${misc:Depends}
Description: test package for webapps-common
Modified: trunk/examples/webapp-apache-dbapp-example/debian/dirs
===================================================================
--- trunk/examples/webapp-apache-example/debian/dirs 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-dbapp-example/debian/dirs 2006-05-15 22:50:51 UTC (rev 81)
@@ -1,3 +1,4 @@
-usr/share/webapps-common/install/webapp-apache-example/httpd
-usr/share/webapp-apache-example/www
-etc/webapp-apache-example
+usr/share/webapps-common/install/webapp-apache-dbapp-example/httpd
+usr/share/webapp-apache-dbapp-example/www
+etc/webapp-apache-dbapp-example
+usr/share/dbconfig-common/data/webapp-apache-dbapp-example/install
Modified: trunk/examples/webapp-apache-dbapp-example/debian/postinst
===================================================================
--- trunk/examples/webapp-apache-example/debian/postinst 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-dbapp-example/debian/postinst 2006-05-15 22:50:51 UTC (rev 81)
@@ -4,7 +4,10 @@
. /usr/share/debconf/confmodule
. /usr/share/webapps-common/dpkg/postinst
-wc_apache_conf_style="template"
-wc_go webapp-apache-example $@
+wc_dbapp="yes"
+dbc_dbtype="mysql"
+dbc_generate_include="php:/etc/webapp-apache-dbapp-example/settings.php"
+dbc_generate_include_args="-O root:www-data -m 640"
+wc_go webapp-apache-dbapp-example $@
#DEBHELPER#
Modified: trunk/examples/webapp-apache-dbapp-example/debian/postrm
===================================================================
--- trunk/examples/webapp-apache-example/debian/postrm 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-dbapp-example/debian/postrm 2006-05-15 22:50:51 UTC (rev 81)
@@ -4,6 +4,7 @@
. /usr/share/debconf/confmodule
. /usr/share/webapps-common/dpkg/postrm
-wc_go webapp-apache-example $@
+wc_dbapp="yes"
+wc_go webapp-apache-dbapp-example $@
#DEBHELPER#
Modified: trunk/examples/webapp-apache-dbapp-example/debian/prerm
===================================================================
--- trunk/examples/webapp-apache-example/debian/prerm 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-dbapp-example/debian/prerm 2006-05-15 22:50:51 UTC (rev 81)
@@ -4,7 +4,7 @@
. /usr/share/debconf/confmodule
. /usr/share/webapps-common/dpkg/prerm
-wc_apache_conf_style="template"
-wc_go webapp-apache-example $@
+wc_dbapp="yes"
+wc_go webapp-apache-dbapp-example $@
#DEBHELPER#
Modified: trunk/examples/webapp-apache-dbapp-example/debian/rules
===================================================================
--- trunk/examples/webapp-apache-example/debian/rules 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-dbapp-example/debian/rules 2006-05-15 22:50:51 UTC (rev 81)
@@ -10,9 +10,10 @@
#export DH_VERBOSE=1
# some shorthand variables to make life a little easier
-p:=webapp-apache-example
+p:=webapp-apache-dbapp-example
ptmp:=debian/$p
INSTDIR:=${ptmp}/usr/share/webapps-common/install/$p/httpd
+DBINSTDIR:=${ptmp}/usr/share/dbconfig-common/data/$p/install
WEBDOCDIR:=${ptmp}/usr/share/$p/www
configure: configure-stamp
@@ -41,7 +42,8 @@
dh_installdirs
# debian/credit-xlators > ${DOC}/TRANSLATORS
cp apache_template.conf ${INSTDIR}/apache_template
- cp index.html ${WEBDOCDIR}
+ cp bootstrap.sql ${DBINSTDIR}/mysql
+ cp index.php ${WEBDOCDIR}
# Build architecture-independent files here.
binary-indep: build install
Deleted: trunk/examples/webapp-apache-dbapp-example/index.html
===================================================================
--- trunk/examples/webapp-apache-example/index.html 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-dbapp-example/index.html 2006-05-15 22:50:51 UTC (rev 81)
@@ -1,3 +0,0 @@
-<p>
-welcome to the front page for webapp-apache-example!
-</p>
Added: trunk/examples/webapp-apache-dbapp-example/index.php
===================================================================
--- trunk/examples/webapp-apache-example/index.php 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-dbapp-example/index.php 2006-05-15 22:50:51 UTC (rev 81)
@@ -0,0 +1,46 @@
+<h1>
+welcome to the front page for webapp-apache-dbapp-example!
+</h1>
+
+<p>
+this package is a quick example of how to use the dbconfig-common
+hooks from within webapps-common for setting up a database in
+addition to configurating the web-accessible site of a package.
+see the source package in /usr/share/doc/webapps-common/examples for
+more details.
+
+<?php
+// config file generated by dbc_generate_include setting in postinst
+require_once("/etc/webapp-apache-dbapp-example/settings.php");
+
+// doing some random stuff to show it works :)
+$dbh = mysql_connect($dbserver, $dbuser, $dbpass);
+if (!$dbh) { die("couldn't connect to database server: " . mysql_error()); }
+$res = mysql_select_db($dbname);
+if(!$res) { die("couldn't connect to database: " . mysql_error()); }
+echo '<p>connected successfullyto database</p>';
+
+echo '<p>SHOW TABLES</p>';
+$sth = mysql_query("SHOW TABLES");
+if(!$sth) { die("unable to perform query: " . mysql_error()); }
+$res = mysql_fetch_assoc($sth);
+echo "<pre>"; var_dump($res); echo "</pre>";
+
+echo '<p>DESCRIBE information</p>';
+$sth = mysql_query("DESCRIBE information");
+if(!$sth) { die("unable to perform query: " . mysql_error()); }
+$res = mysql_fetch_assoc($sth);
+echo "<pre>"; var_dump($res); echo "</pre>";
+
+echo '<p>SELECT * FROM information</p>';
+$sth = mysql_query("SELECT * FROM information");
+if(!$sth) { die("unable to perform query: " . mysql_error()); }
+while($res = mysql_fetch_assoc($sth)){
+ echo "<pre>"; var_dump($res); echo "</pre>";
+}
+
+mysql_close($dbh);
+
+
+
+?>
Modified: trunk/examples/webapp-apache-example/debian/config
===================================================================
--- trunk/examples/webapp-apache-example/debian/config 2006-05-14 22:43:07 UTC (rev 80)
+++ trunk/examples/webapp-apache-example/debian/config 2006-05-15 22:50:51 UTC (rev 81)
@@ -4,5 +4,4 @@
. /usr/share/debconf/confmodule
. /usr/share/webapps-common/dpkg/config
-wc_apache_conf_style="template"
wc_go webapp-apache-example $@
Modified: trunk/examples/webapp-apache-example/debian/postinst
===================================================================
--- trunk/examples/webapp-apache-example/debian/postinst 2006-05-14 22:43:07 UTC (rev 80)
+++ trunk/examples/webapp-apache-example/debian/postinst 2006-05-15 22:50:51 UTC (rev 81)
@@ -4,7 +4,6 @@
. /usr/share/debconf/confmodule
. /usr/share/webapps-common/dpkg/postinst
-wc_apache_conf_style="template"
wc_go webapp-apache-example $@
#DEBHELPER#
Modified: trunk/examples/webapp-apache-example/debian/prerm
===================================================================
--- trunk/examples/webapp-apache-example/debian/prerm 2006-05-14 22:43:07 UTC (rev 80)
+++ trunk/examples/webapp-apache-example/debian/prerm 2006-05-15 22:50:51 UTC (rev 81)
@@ -4,7 +4,6 @@
. /usr/share/debconf/confmodule
. /usr/share/webapps-common/dpkg/prerm
-wc_apache_conf_style="template"
wc_go webapp-apache-example $@
#DEBHELPER#
Copied: trunk/examples/webapp-apache-multihost-example (from rev 79, trunk/examples/webapp-apache-example)
Modified: trunk/examples/webapp-apache-multihost-example/apache_template.conf
===================================================================
--- trunk/examples/webapp-apache-example/apache_template.conf 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-multihost-example/apache_template.conf 2006-05-15 22:50:51 UTC (rev 81)
@@ -11,6 +11,6 @@
# Where foo is the
_WC_DOCROOT_DIRECTIVE_
-<Directory /usr/share/webapp-apache-example/www>
+<Directory /usr/share/webapp-apache-multihost-example/www>
# other stuff could be done here...
</Directory>
Modified: trunk/examples/webapp-apache-multihost-example/debian/changelog
===================================================================
--- trunk/examples/webapp-apache-example/debian/changelog 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-multihost-example/debian/changelog 2006-05-15 22:50:51 UTC (rev 81)
@@ -1,4 +1,4 @@
-webapp-apache-example (0.0) UNRELEASED; urgency=low
+webapp-apache-multihost-example (0.0) UNRELEASED; urgency=low
* initial version.
Modified: trunk/examples/webapp-apache-multihost-example/debian/config
===================================================================
--- trunk/examples/webapp-apache-example/debian/config 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-multihost-example/debian/config 2006-05-15 22:50:51 UTC (rev 81)
@@ -4,5 +4,6 @@
. /usr/share/debconf/confmodule
. /usr/share/webapps-common/dpkg/config
-wc_apache_conf_style="template"
-wc_go webapp-apache-example $@
+
+wc_multiple_instances="yes"
+wc_go webapp-apache-multihost-example $@
Modified: trunk/examples/webapp-apache-multihost-example/debian/control
===================================================================
--- trunk/examples/webapp-apache-example/debian/control 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-multihost-example/debian/control 2006-05-15 22:50:51 UTC (rev 81)
@@ -1,11 +1,11 @@
-Source: webapp-apache-example
+Source: webapp-apache-multihost-example
Section: admin
Priority: optional
Maintainer: sean finney <seanius at debian.org>
Build-Depends: debhelper (>= 4.0.0)
Standards-Version: 3.6.1
-Package: webapp-apache-example
+Package: webapp-apache-multihost-example
Architecture: all
Depends: webapps-common, ${misc:Depends}
Description: test package for webapps-common
Modified: trunk/examples/webapp-apache-multihost-example/debian/dirs
===================================================================
--- trunk/examples/webapp-apache-example/debian/dirs 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-multihost-example/debian/dirs 2006-05-15 22:50:51 UTC (rev 81)
@@ -1,3 +1,3 @@
-usr/share/webapps-common/install/webapp-apache-example/httpd
-usr/share/webapp-apache-example/www
-etc/webapp-apache-example
+usr/share/webapps-common/install/webapp-apache-multihost-example/httpd
+usr/share/webapp-apache-multihost-example/www
+etc/webapp-apache-multihost-example
Modified: trunk/examples/webapp-apache-multihost-example/debian/postinst
===================================================================
--- trunk/examples/webapp-apache-example/debian/postinst 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-multihost-example/debian/postinst 2006-05-15 22:50:51 UTC (rev 81)
@@ -4,7 +4,6 @@
. /usr/share/debconf/confmodule
. /usr/share/webapps-common/dpkg/postinst
-wc_apache_conf_style="template"
-wc_go webapp-apache-example $@
+wc_go webapp-apache-multihost-example $@
#DEBHELPER#
Modified: trunk/examples/webapp-apache-multihost-example/debian/postrm
===================================================================
--- trunk/examples/webapp-apache-example/debian/postrm 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-multihost-example/debian/postrm 2006-05-15 22:50:51 UTC (rev 81)
@@ -4,6 +4,6 @@
. /usr/share/debconf/confmodule
. /usr/share/webapps-common/dpkg/postrm
-wc_go webapp-apache-example $@
+wc_go webapp-apache-multihost-example $@
#DEBHELPER#
Modified: trunk/examples/webapp-apache-multihost-example/debian/prerm
===================================================================
--- trunk/examples/webapp-apache-example/debian/prerm 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-multihost-example/debian/prerm 2006-05-15 22:50:51 UTC (rev 81)
@@ -4,7 +4,6 @@
. /usr/share/debconf/confmodule
. /usr/share/webapps-common/dpkg/prerm
-wc_apache_conf_style="template"
-wc_go webapp-apache-example $@
+wc_go webapp-apache-multihost-example $@
#DEBHELPER#
Modified: trunk/examples/webapp-apache-multihost-example/debian/rules
===================================================================
--- trunk/examples/webapp-apache-example/debian/rules 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-multihost-example/debian/rules 2006-05-15 22:50:51 UTC (rev 81)
@@ -10,7 +10,7 @@
#export DH_VERBOSE=1
# some shorthand variables to make life a little easier
-p:=webapp-apache-example
+p:=webapp-apache-multihost-example
ptmp:=debian/$p
INSTDIR:=${ptmp}/usr/share/webapps-common/install/$p/httpd
WEBDOCDIR:=${ptmp}/usr/share/$p/www
Modified: trunk/examples/webapp-apache-multihost-example/index.html
===================================================================
--- trunk/examples/webapp-apache-example/index.html 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/examples/webapp-apache-multihost-example/index.html 2006-05-15 22:50:51 UTC (rev 81)
@@ -1,3 +1,3 @@
<p>
-welcome to the front page for webapp-apache-example!
+welcome to the front page for webapp-apache-multihost-example!
</p>
More information about the Webapps-common-discuss
mailing list