From 78635ff88c3acd249a3e120721cb3c0b9976aa6e Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Mon, 23 May 2011 09:22:59 +0000 Subject: [PATCH] fix patch for config.inc.php when creating .deb git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1061 a1433add-5e2c-0410-b055-b7f2511e0802 --- ...20100221_db-credentials => 20110523_db-credentials} | 10 ++++------ debian/patches/series | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) rename debian/patches/{20100221_db-credentials => 20110523_db-credentials} (84%) diff --git a/debian/patches/20100221_db-credentials b/debian/patches/20110523_db-credentials similarity index 84% rename from debian/patches/20100221_db-credentials rename to debian/patches/20110523_db-credentials index b7aa28cf..d106e1e6 100644 --- a/debian/patches/20100221_db-credentials +++ b/debian/patches/20110523_db-credentials @@ -1,7 +1,7 @@ -Index: postfixadmin-trunk/config.inc.php +Index: config.inc.php =================================================================== ---- postfixadmin-trunk.orig/config.inc.php 2010-02-21 19:04:32.000000000 +0100 -+++ postfixadmin-trunk/config.inc.php 2010-02-21 19:05:26.000000000 +0100 +--- trunk.orig/config.inc.php (revision 1060) ++++ trunk/config.inc.php (working copy) @@ -23,7 +23,7 @@ * Doing this implies you have changed this file as required. * i.e. configuring database etc; specifying setup.php password etc. @@ -11,7 +11,7 @@ Index: postfixadmin-trunk/config.inc.php // In order to setup Postfixadmin, you MUST specify a hashed password here. // To create the hash, visit setup.php in a browser and type a password into the field, -@@ -45,11 +45,12 @@ +@@ -45,11 +45,11 @@ // mysql = MySQL 3.23 and 4.0, 4.1 or 5 // mysqli = MySQL 4.1+ // pgsql = PostgreSQL @@ -20,7 +20,6 @@ Index: postfixadmin-trunk/config.inc.php -$CONF['database_user'] = 'postfix'; -$CONF['database_password'] = 'postfixadmin'; -$CONF['database_name'] = 'postfix'; -+ +$CONF['database_type'] = '_DBC_DBTYPE_'; +$CONF['database_host'] = '_DBC_DBSERVER_'; +$CONF['database_user'] = '_DBC_DBUSER_'; @@ -29,4 +28,3 @@ Index: postfixadmin-trunk/config.inc.php // If you need to specify a different port for a MYSQL database connection, use e.g. // $CONF['database_host'] = '172.30.33.66:3308'; // If you need to specify a different port for POSTGRESQL database connection - diff --git a/debian/patches/series b/debian/patches/series index 91d070ca..f17478f0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -20100221_db-credentials +20110523_db-credentials