[Webapps-common-discuss] webapps-common/debian changelog, 1.9, 1.10 webapps-common.templates, 1.5, 1.6

[seanius at haydn.debian.org]

Update of /cvsroot/webapps-common/webapps-common/debian
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv31160/debian

Modified Files:
	changelog webapps-common.templates 
Log Message:
another nice chunkawork.  the debconf/config-script process is getting
closer to how the final process should look, though more work needs to
be done to implement the configuration all the way through.


Index: changelog
===================================================================
RCS file: /cvsroot/webapps-common/webapps-common/debian/changelog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- changelog	1 Apr 2006 17:53:39 -0000	1.9
+++ changelog	5 Apr 2006 07:30:00 -0000	1.10
@@ -2,15 +2,17 @@
 
   [sean finney]
   * significant work done on retooling debconf->config file interaction
-    based on no longer having preinst scripts.
+    based on no longer having preinst scripts.  more still needs to
+    be done...
+  * various other debconf-logic improvements.
   * more work on making debugging useful.  export wc_debug=1, or
-    wc_debug=insane if you want to see.
+    wc_debug=insane (if you're really brave) if you want to see.
   * make sure purge removes everything it's supposed to (ucf files,
     vhost-registered debconf templates, etc)
   * virtualhosts.conf wasn't quite working... it is now.
   * small fixes in list handling functions _wc_list_remove/_wc_list_join
 
- -- sean finney <seanius at debian.org>  Sat, 01 Apr 2006 14:09:58 +0200
+ -- sean finney <seanius at debian.org>  Wed, 05 Apr 2006 09:28:16 +0200
 
 webapps-common (0.3) UNRELEASED; urgency=low
 

Index: webapps-common.templates
===================================================================
RCS file: /cvsroot/webapps-common/webapps-common/debian/webapps-common.templates,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- webapps-common.templates	17 Aug 2005 16:40:41 -0000	1.5
+++ webapps-common.templates	5 Apr 2006 07:30:00 -0000	1.6
@@ -76,19 +76,31 @@
 
 Template: webapps-common/httpd/install_type
 Type: select
-_Choices: single, virtualhost
-_Description: Select how ${pkg} should be installed for ${httpd}.
- Web server package configuration can be done as either 'single'
- installation or a 'virtualhost' configuration.
+_Choices: directory, virtualhost + directory, multiple instances
+_Description: How should ${pkg} be configured for web access?
+ If you select "directory", then you will be simply prompted for the
+ name of the directory on your web server from which you would like
+ your application to be available.
  .
- The former will enable the package for a standard web server installation.
- The latter will give you the ability to install multiple instances of of
- this package. 
+ If you select "virtualhost + directory", you will also be given the
+ choice of running your application under a new or pre-existing
+ virtualhost.
+ .
+ If you select "multiple instances", then you will be provided with the
+ ability to configure multiple virtualhost + directory configurations.
+ For some applications this may allow a single package to host many
+ independant instances of itself, which is ideal for situations where
+ you may wish to provide the same service to multiple groups of users.
 
 Template: webapps-common/httpd/virtualhost_new
 Type: string
 _Description: Please enter the name of a new virtualhost.
 
+Template: webapps-common/httpd/virtualhost_single
+Type: select
+_Choices: ${vhosts}
+_Description: Please select the virtualhost with which to configure ${pkg}
+
 Template: webapps-common/httpd/virtualhost
 Type: multiselect
 _Choices: ${vhosts}