[Dbconfig-common-devel] dbconfig-common/dpkg common,1.14,1.15 config,1.12,1.13 prerm,1.5,1.6
seanius@haydn.debian.org
seanius@haydn.debian.org
Update of /cvsroot/dbconfig-common/dbconfig-common/dpkg
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv9349/dpkg
Modified Files:
common config prerm
Log Message:
misc fixes for the template changes
Index: common
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/common,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- common 18 Apr 2005 03:48:41 -0000 1.14
+++ common 24 Apr 2005 22:38:50 -0000 1.15
@@ -33,10 +33,10 @@
dbc_standard_templates="database-type dbconfig-install dbconfig-upgrade dbconfig-remove password-confirm purge upgrade-backup passwords-do-not-match install-error upgrade-error remove-error"
# templates common to mysql database types
- dbc_mysql_templates="mysql/dbname mysql/method remote/host mysql/newhost mysql/app-user mysql/app-pass mysql/admin-user mysql/admin-pass mysql/port"
+ dbc_mysql_templates="mysql/method remote/host remote/newhost mysql/app-pass mysql/admin-user mysql/admin-pass remote/port db/dbname db/app-user"
# templates common to postgresql database types
- dbc_pgsql_templates="pgsql/dbname pgsql/method remote/host pgsql/newhost pgsql/app-user pgsql/app-pass pgsql/admin-user pgsql/admin-pass pgsql/port pgsql/authmethod-admin pgsql/authmethod-user pgsql/changeconf pgsql/manualconf"
+ dbc_pgsql_templates="pgsql/method remote/host remote/newhost pgsql/app-pass pgsql/admin-user pgsql/admin-pass remote/port pgsql/authmethod-admin pgsql/authmethod-user pgsql/changeconf pgsql/manualconf db/dbname db/app-user"
# all dbtypes supported by dbconfig-common
dbc_all_supported_dbtypes="mysql pgsql"
@@ -147,13 +147,13 @@
_dbc_sanity_check dbtype || dbc_install_error
# get app user
- db_get $dbc_package/$dbc_dbtype/app-user && dbc_dbuser="$RET"
+ db_get $dbc_package/db/app-user && dbc_dbuser="$RET"
# get the db server
db_get $dbc_package/remote/host && dbc_dbserver="$RET"
# get the name of the database to be created
- db_get $dbc_package/$dbc_dbtype/dbname && dbc_dbname="$RET"
+ db_get $dbc_package/db/dbname && dbc_dbname="$RET"
# get the database administrator name
db_get $dbc_package/$dbc_dbtype/admin-user && dbc_dbadmin="$RET"
Index: config
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/config,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- config 18 Apr 2005 03:48:42 -0000 1.12
+++ config 24 Apr 2005 22:38:50 -0000 1.13
@@ -111,20 +111,20 @@
db_set $dbc_package/dbconfig-remove "$dbc_remove"
fi
if [ "$dbc_dbuser" ]; then
- db_set $dbc_package/$dbc_dbtype/app-user "$dbc_dbuser"
+ db_set $dbc_package/db/app-user "$dbc_dbuser"
fi
if [ "$dbc_dbpass" ]; then
db_set $dbc_package/$dbc_dbtype/app-pass "$dbc_dbpass"
db_fset $dbc_package/$dbc_dbtype/app-pass seen true
fi
if [ "$dbc_dbname" ]; then
- db_set $dbc_package/$dbc_dbtype/dbname "$dbc_dbname"
+ db_set $dbc_package/db/dbname "$dbc_dbname"
fi
if [ "$dbc_dbserver" ]; then
db_set $dbc_package/remote/host "$dbc_dbserver"
fi
if [ "$dbc_dbport" ]; then
- db_set $dbc_packageremote/port "$dbc_dbport"
+ db_set $dbc_package/remote/port "$dbc_dbport"
fi
if [ "$dbc_dbadmin" ]; then
db_set $dbc_package/$dbc_dbtype/admin-user "$dbc_dbadmin"
@@ -171,8 +171,8 @@
# if they've chosen "new host" or the host list was empty
if [ ! "$host" -o "$host" = "new host" ]; then
# prompt them for a new hostname
- db_input high $dbc_packageremote/newhost || true
- db_input high $dbc_packageremote/newhost || true
+ db_input high $dbc_package/remote/newhost || true
+ db_input high $dbc_package/remote/newhost || true
fi
fi
;;
@@ -180,8 +180,8 @@
6)
if [ "$dbc_method" != "unix socket" ]; then
if [ ! "$host" -o "$host" = "new host" ]; then
- db_get $dbc_packageremote/newhost
- db_get $dbc_packageremote/newhost
+ db_get $dbc_package/remote/newhost
+ db_get $dbc_package/remote/newhost
newhost="$RET"
# add the new host to the existing list of hosts
@@ -193,12 +193,12 @@
# set the "newhost" to the selected host, because
# the second time through the configure script we'll
# need this set
- db_set $dbc_packageremote/newhost "$host"
- db_set $dbc_packageremote/newhost "$host"
+ db_set $dbc_package/remote/newhost "$host"
+ db_set $dbc_package/remote/newhost "$host"
fi
# on what port?
- db_input low $dbc_packageremote/port || true
+ db_input low $dbc_package/remote/port || true
fi
;;
# state 7 - pgsql specific auth stuff, part 1
@@ -244,14 +244,14 @@
dbc_dbadmpass=`dbc_get_admin_pass $dbc_package $dbc_dbtype`
fi
- db_input low $dbc_package/$dbc_dbtype/app-user || true
+ db_input low $dbc_package/db/app-user || true
if [ "$need_userpw" != "false" ]; then
dbc_dbpass=`dbc_get_app_pass $dbc_package $dbc_dbtype`
fi
# get the name of the database to use
- db_input low $dbc_package/$dbc_dbtype/dbname || true
+ db_input low $dbc_package/db/dbname || true
;;
# * - end state
*)
Index: prerm
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/prerm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- prerm 1 Apr 2005 23:52:47 -0000 1.5
+++ prerm 24 Apr 2005 22:38:50 -0000 1.6
@@ -34,7 +34,7 @@
db_get $dbc_package/remote/host && dbc_dbserver="$RET"
# get the name of the database created
- db_get $dbc_packagedb/dbname && dbc_dbname="$RET"
+ db_get $dbc_package/db/dbname && dbc_dbname="$RET"
# get the admin user
db_get $dbc_package/$dbc_dbtype/admin-user && dbc_dbadmin="$RET"