[Dbconfig-common-changes] [dbconfig-common] r300 - in branches/sqlite: doc examples/db-test-sqlite-2.0/debian internal

[Matt Brown]

Author: mattb-guest
Date: 2006-08-15 08:02:14 +0000 (Tue, 15 Aug 2006)
New Revision: 300

Modified:
   branches/sqlite/doc/dbconfig-common.sgml
   branches/sqlite/examples/db-test-sqlite-2.0/debian/postinst
   branches/sqlite/internal/sqlite
Log:
Move dbc_owner and dbc_perms to dbc_dbfile_owner and dbc_dbfile_perms to
ensure that there is no confusion over their intended purpose. 

Add an example of their usage to the SQLite test package


Modified: branches/sqlite/doc/dbconfig-common.sgml
===================================================================
--- branches/sqlite/doc/dbconfig-common.sgml	2006-08-15 06:57:43 UTC (rev 299)
+++ branches/sqlite/doc/dbconfig-common.sgml	2006-08-15 08:02:14 UTC (rev 300)
@@ -406,12 +406,12 @@
 			<tag>dbc_dbtypes (used in: <var>config</var>)
 				<item>database types supported by the
 				package (defaults to: empty)
-			<tag>dbc_owner (used in: <var>postinst</var>)
+			<tag>dbc_dbfile_owner (used in: <var>postinst</var>)
                 <item>set the owner:group for the generated database file. This
                 option is only valid for databases like SQLite that use a
                 single file for storage and is not prompted via debconf.
                 (defaults to: root:root)
-			<tag>dbc_perms (used in: <var>postinst</var>)
+			<tag>dbc_dbfile_perms (used in: <var>postinst</var>)
                 <item>set the permissions for the generated database file. This
                 option is only valid for databases like SQLite that use a
                 single file for storage and is not prompted via debconf.

Modified: branches/sqlite/examples/db-test-sqlite-2.0/debian/postinst
===================================================================
--- branches/sqlite/examples/db-test-sqlite-2.0/debian/postinst	2006-08-15 06:57:43 UTC (rev 299)
+++ branches/sqlite/examples/db-test-sqlite-2.0/debian/postinst	2006-08-15 08:02:14 UTC (rev 300)
@@ -6,6 +6,12 @@
 . /usr/share/debconf/confmodule
 . /usr/share/dbconfig-common/dpkg/postinst.sqlite 
 dbc_generate_include=php:/etc/db-test-sqlite/debian-db.php
+
+# Uncomment the following lines if you want to set different permissions
+# on the installed database file
+#dbc_dbfile_owner="root:www-data"
+#dbc_dbfile_perms="0644"
+
 dbc_go db-test-sqlite $@
 
 #DEBHELPER#

Modified: branches/sqlite/internal/sqlite
===================================================================
--- branches/sqlite/internal/sqlite	2006-08-15 06:57:43 UTC (rev 299)
+++ branches/sqlite/internal/sqlite	2006-08-15 08:02:14 UTC (rev 300)
@@ -76,8 +76,8 @@
 	# Default to root:root 0640 if the maintainer hasn't hinted otherwise
 	l_owner="root:root"
 	l_perms="0640"
-	if [ -n "$dbc_owner" ]; then l_owner="$dbc_owner"; fi
-	if [ -n "$dbc_perms" ]; then l_perms="$dbc_perms"; fi
+	if [ -n "$dbc_dbfile_owner" ]; then l_owner="$dbc_dbfile_owner"; fi
+	if [ -n "$dbc_dbfile_perms" ]; then l_perms="$dbc_dbfile_perms"; fi
 
 	dbc_logpart "creating database $dbc_dbname:"