From bd67419e000877bfc015e459f25dfe815f0930c0 Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Mon, 14 Mar 2011 22:52:49 +0000 Subject: [PATCH] debian: update patch files for 2.3.3 git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/branches/postfixadmin-2.3@1009 a1433add-5e2c-0410-b055-b7f2511e0802 --- .../{20100221_db-credentials => 20110414_db-credentials} | 6 +++--- debian/patches/series | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename debian/patches/{20100221_db-credentials => 20110414_db-credentials} (92%) diff --git a/debian/patches/20100221_db-credentials b/debian/patches/20110414_db-credentials similarity index 92% rename from debian/patches/20100221_db-credentials rename to debian/patches/20110414_db-credentials index 9977372e..0cf3d066 100644 --- a/debian/patches/20100221_db-credentials +++ b/debian/patches/20110414_db-credentials @@ -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 @@ +@@ -46,11 +46,11 @@ // mysql = MySQL 3.23 and 4.0, 4.1 or 5 // mysqli = MySQL 4.1+ // pgsql = PostgreSQL @@ -20,12 +20,12 @@ 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_'; +$CONF['database_password'] = '_DBC_DBPASS_'; +$CONF['database_name'] = '_DBC_DBNAME_'; - $CONF['database_prefix'] = ''; // 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..eaed553b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -20100221_db-credentials +20110414_db-credentials