[Pkg-drupal-commits] r2175 - in /branches/drupal7/debian: changelog dbconfig.template docs drupal7.postinst

[luigi at users.alioth.debian.org]

Author: luigi
Date: Sat Mar  5 18:10:40 2011
New Revision: 2175

URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=2175
Log:
Generate database configuration from template

Added:
    branches/drupal7/debian/dbconfig.template
Modified:
    branches/drupal7/debian/changelog
    branches/drupal7/debian/docs
    branches/drupal7/debian/drupal7.postinst

Modified: branches/drupal7/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/changelog?rev=2175&op=diff
==============================================================================
--- branches/drupal7/debian/changelog (original)
+++ branches/drupal7/debian/changelog Sat Mar  5 18:10:40 2011
@@ -10,6 +10,9 @@
 
   * debian/README.Debian
     - Added instructions on how to enable drupal in Apache2
+
+  * debian/{drupal7.postinst,docs,dbconfig.template}
+    - Generate database configuration from template
 
   [ Kinga Marjai ]
   * debian/control

Added: branches/drupal7/debian/dbconfig.template
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/dbconfig.template?rev=2175&op=file
==============================================================================
--- branches/drupal7/debian/dbconfig.template (added)
+++ branches/drupal7/debian/dbconfig.template Sat Mar  5 18:10:40 2011
@@ -1,0 +1,22 @@
+<?php
+#
+# database access settings in php format
+# automatically generated from /etc/dbconfig-common/drupal7.conf
+# by /usr/sbin/dbconfig-generate-include
+#
+# by default this file is managed via ucf, so you shouldn't have to
+# worry about manual changes being silently discarded.  *however*,
+# you'll probably also want to edit the configuration file mentioned
+# above too.
+
+$databases['default']['default'] = array(
+	'driver' => '_DBC_DBTYPE_',
+	'database' => '_DBC_DBNAME_',
+	'username' => '_DBC_DBUSER_',
+	'password' => '_DBC_DBPASS',
+	'host' => '_DBC_DBSERVER',
+	'port' => '_DBC_DBPORT',
+	'prefix' => '_DBC_BASEPATH'
+);
+
+?>

Modified: branches/drupal7/debian/docs
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/docs?rev=2175&op=diff
==============================================================================
--- branches/drupal7/debian/docs (original)
+++ branches/drupal7/debian/docs Sat Mar  5 18:10:40 2011
@@ -3,3 +3,4 @@
 INSTALL.mysql.txt
 INSTALL.pgsql.txt
 scripts
+debian/dbconfig.template

Modified: branches/drupal7/debian/drupal7.postinst
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/drupal7.postinst?rev=2175&op=diff
==============================================================================
--- branches/drupal7/debian/drupal7.postinst (original)
+++ branches/drupal7/debian/drupal7.postinst Sat Mar  5 18:10:40 2011
@@ -3,9 +3,10 @@
 
 set -e
 
-dbc_generate_include='php:/etc/drupal/7/sites/default/dbconfig.php'
+dbc_generate_include='template:/etc/drupal/7/sites/default/dbconfig.php'
 dbc_generate_include_owner='root:www-data'
 dbc_generate_include_perms='640'
+dbc_generate_include_args='-o template_infile=/usr/share/doc/drupal7/dbconfig.template'
 dbc_pgsql_createdb_encoding='UTF8'
 
 . /usr/share/debconf/confmodule