[Dbconfig-common-changes] [dbconfig-common] r220 - in trunk: debian doc dpkg examples/db-test-pgsql-2.0/debian

[Sean Finney]

Author: seanius
Date: 2006-05-23 09:59:05 +0000 (Tue, 23 May 2006)
New Revision: 220

Modified:
   trunk/debian/changelog
   trunk/debian/dbconfig-common.templates
   trunk/doc/dbconfig-common-using.html
   trunk/dpkg/common
   trunk/examples/db-test-pgsql-2.0/debian/config
Log:
new hook for specifying default authmethod

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-05-23 07:19:50 UTC (rev 219)
+++ trunk/debian/changelog	2006-05-23 09:59:05 UTC (rev 220)
@@ -6,6 +6,9 @@
     (closes: #366761).
   * andrew mcmillan found a spelling error, so i ran aspell over all
     the documentation :)
+  * provide a new hint option dbc_default_authmethod_user for the packager
+    to provide the "sane default" for how the application's database
+    user should authenticate for pgsql applications (closes: #368219).
 
  -- sean finney <seanius at debian.org>  Tue, 23 May 2006 09:06:54 +0200
 

Modified: trunk/debian/dbconfig-common.templates
===================================================================
--- trunk/debian/dbconfig-common.templates	2006-05-23 07:19:50 UTC (rev 219)
+++ trunk/debian/dbconfig-common.templates	2006-05-23 09:59:05 UTC (rev 220)
@@ -305,7 +305,7 @@
 Template: dbconfig-common/pgsql/authmethod-user
 Type: select
 __Choices: ident, password
-Default: ident
+Default: ${default_authmethod_user}
 _Description: Method for authenticating PostgreSQL user:
  PostgreSQL servers provide several different mechanisms for authenticating
  connections.  Please select what method the database user should use

Modified: trunk/doc/dbconfig-common-using.html
===================================================================
--- trunk/doc/dbconfig-common-using.html	2006-05-23 07:19:50 UTC (rev 219)
+++ trunk/doc/dbconfig-common-using.html	2006-05-23 09:59:05 UTC (rev 220)
@@ -385,6 +385,14 @@
 <td>postinst
 <td>if nonempty, specifies that sql files should be piped through a template substitution filter (dbconfig-generate-include -f template) before being executed.
 <td>empty
+<tr>
+<td>dbc_default_authmethod_user
+<td>config
+<td>if set to "password", dbconfig-common will set the default postgres
+authentication method to "password" (not using a local unix id).
+unless your postgres application uses a local unix account, you probably
+want to set this.
+<td>ident
 </table>
 
 <a name="debugging">

Modified: trunk/dpkg/common
===================================================================
--- trunk/dpkg/common	2006-05-23 07:19:50 UTC (rev 219)
+++ trunk/dpkg/common	2006-05-23 09:59:05 UTC (rev 220)
@@ -692,8 +692,15 @@
 ### register all the necessary debconf templates
 ###
 dbc_register_debconf(){
-	local f
+	local f local authmethod_user
 	dbc_debug "dbc_register_debconf() $@"
+
+	if [ "$dbc_default_authmethod_user" = "password" ]; then
+		authmethod_user="password"
+	else
+		authmethod_user="ident"
+	fi
+
 	for f in $dbc_register_templates; do
 		# perform some basic customizing substitutions
 		db_register dbconfig-common/$f $dbc_package/$f
@@ -701,5 +708,6 @@
 		if [ "$dbc_dbvendor" ]; then
 			db_subst $dbc_package/$f dbvendor $dbc_dbvendor
 		fi
+		db_subst $dbc_package/$f default_authmethod_user $authmethod_user
 	done
 }

Modified: trunk/examples/db-test-pgsql-2.0/debian/config
===================================================================
--- trunk/examples/db-test-pgsql-2.0/debian/config	2006-05-23 07:19:50 UTC (rev 219)
+++ trunk/examples/db-test-pgsql-2.0/debian/config	2006-05-23 09:59:05 UTC (rev 220)
@@ -6,4 +6,5 @@
 . /usr/share/debconf/confmodule
 . /usr/share/dbconfig-common/dpkg/config.pgsql 
 
+dbc_authmethod_user="password"
 dbc_go db-test-pgsql $@