[Dbconfig-common-devel] dbconfig-common/debian changelog,1.17,1.18 dbconfig-common.templates,1.12,1.13

seanius@haydn.debian.org seanius@haydn.debian.org


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

Modified Files:
	changelog dbconfig-common.templates 
Log Message:
consolidation of many mysql/pgsql templates into single templates, using
a new ${dbvendor} subst variable.  warning, this is not tested, so we
may be broken.


Index: changelog
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/debian/changelog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- changelog	1 Apr 2005 23:19:21 -0000	1.17
+++ changelog	1 Apr 2005 23:52:46 -0000	1.18
@@ -1,9 +1,12 @@
-dbconfig-common (1.5.2) UNRELEASED; urgency=low
+dbconfig-common (1.6) UNRELEASED; urgency=low
 
+  * added a substitutable ${dbvendor} variable in the questions, which allows
+    me to drastically shrink a number of similar mysql/pgsql questions.
+  * drastically shrank a number of similar mysql/pgsql questions :)
   * spanish translation from Javier Fernández-Sanguino Peña <jfs@computer.org>.
   * minor typographical corrections from Javier.
 
- -- sean finney <seanius@debian.org>  Fri, 01 Apr 2005 18:16:24 -0500
+ -- sean finney <seanius@debian.org>  Fri, 01 Apr 2005 18:50:49 -0500
 
 dbconfig-common (1.5.1) experimental; urgency=low
 

Index: dbconfig-common.templates
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/debian/dbconfig-common.templates,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- dbconfig-common.templates	1 Apr 2005 23:19:21 -0000	1.12
+++ dbconfig-common.templates	1 Apr 2005 23:52:46 -0000	1.13
@@ -157,56 +157,56 @@
  .
  ${error}
 
-Template: dbconfig-common/mysql/method
-Type: select
-Choices: unix socket, tcp/ip
-Default: unix socket
-_Description: Connection method for MySQL database of ${pkg}:
- By default, ${pkg} will be configured to use a MySQL server
- through a local unix socket (this provides the best performance).
- However, if you would like to connect with a different method, or to a
- different server entirely, select an option from the choices below.
-
-Template: dbconfig-common/mysql/host
+Template: dbconfig-common/remote/host
 Type: select
 Choices: ${hosts}
-_Description: Host name of the MySQL database server for ${pkg}:
+_Description: Host name of the ${dbvendor} database server for ${pkg}:
  Please select the remote hostname to use, or select "new host" to
  enter a new host.
 
-Template: dbconfig-common/mysql/port
+Template: dbconfig-common/remote/port
 Type: string
-_Description: Port number for the MySQL service:
- If the MySQL database on the remote host is running on a non-standard
+_Description: Port number for the ${dbvendor} service:
+ If the ${dbvendor} database on the remote host is running on a non-standard
  port, this is your opportunity to specify what it is.  To use the
  default port, leave this field blank.
 
-Template: dbconfig-common/mysql/newhost
+Template: dbconfig-common/remote/newhost
 Type: string
-_Description: Host running the MySQL server for ${pkg}:
- Please provide the hostname of a remote MySQL server.
+_Description: Host running the ${dbvendor} server for ${pkg}:
+ Please provide the hostname of a remote ${dbvendor} server.
  .
  Note: you must have already arranged for the administrative
  account to be able to remotely create databases and grant
  privileges.
 
-Template: dbconfig-common/mysql/dbname
+Template: dbconfig-common/db/dbname
 Type: string
 Default: ${pkg}
-_Description: MySQL database name for ${pkg}:
- Please provide a name for the MySQL database to be used by ${pkg}.
+_Description: ${dbvendor} database name for ${pkg}:
+ Please provide a name for the ${dbvendor} database to be used by ${pkg}.
 
-Template: dbconfig-common/mysql/app-user
+Template: dbconfig-common/db/app-user
 Type: string
-_Description: MySQL username for ${pkg}:
- Please provide a MySQL username for ${pkg} to register with the
- database server.  A MySQL user is not necessarily the same as a
+_Description: ${dbvendor} username for ${pkg}:
+ Please provide a ${dbvendor} username for ${pkg} to register with the
+ database server.  A ${dbvendor} user is not necessarily the same as a
  system login, especially if the database is on a remote server.
  .
  This is the user which will own the database, tables and other
  objects to be created by this installation.  This user will have
  complete freedom to insert, change or delete data in the database.
 
+Template: dbconfig-common/mysql/method
+Type: select
+Choices: unix socket, tcp/ip
+Default: unix socket
+_Description: Connection method for MySQL database of ${pkg}:
+ By default, ${pkg} will be configured to use a MySQL server
+ through a local unix socket (this provides the best performance).
+ However, if you would like to connect with a different method, or to a
+ different server entirely, select an option from the choices below.
+
 Template: dbconfig-common/mysql/app-pass
 Type: password
 _Description: MySQL application password for ${pkg}:
@@ -239,48 +239,6 @@
  through a local unix socket (this provides the best performance).
  However, if you would like to connect with a different method, or to a
  different server entirely, select an option from the choices below.
-
-Template: dbconfig-common/pgsql/host
-Type: select
-Choices: ${hosts}
-_Description: Host name of the PostgreSQL database server for ${pkg}:
- Please select the remote hostname to use, or select "new host" to
- enter a new host.
-
-Template: dbconfig-common/pgsql/port
-Type: string
-_Description: Port number for the PostgreSQL service:
- If the PostgreSQL database on the remote host is running on a
- non-standard port, this is your opportunity to specify what it is.
- To use the default port, leave this field blank.
-
-Template: dbconfig-common/pgsql/newhost
-Type: string
-_Description: Host running the PostgreSQL server for ${pkg}:
- Please provide the hostname of remote PostgreSQL server.
- .
- Note: you must have already arranged for the administrative
- account to be able to remotely create databases and grant
- privileges.
-
-Template: dbconfig-common/pgsql/dbname
-Type: string
-Default: ${pkg}
-_Description: PostgreSQL database name for ${pkg}:
- Please provide a name for the PostgreSQL database to be used by ${pkg}.
-
-Template: dbconfig-common/pgsql/app-user
-Type: string
-Default: ${pkg}
-_Description: PostgreSQL username for ${pkg}:
- Please provide a username for ${pkg} to register with the
- database server.  A PostgreSQL user is not necessarily the same as a
- system login, especially if the database is on a remote server.
- .
- This is the user which will own the database, schemas, tables and other
- objects to be created by this installation.  This user will have
- complete freedom to insert, change or delete data in the database or
- to grant or revoke access to it.
 
 Template: dbconfig-common/pgsql/app-pass
 Type: password