Merged debian/* stuff from trunk to postfixadmin-2.3 branch
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/branches/postfixadmin-2.3@1334 a1433add-5e2c-0410-b055-b7f2511e0802postfixadmin-2.3
Norman Messtorff
13 years ago
parent
fac93bf28b
commit
894d83d3e1
@ -1,31 +1,6 @@
|
||||
postfixadmin (2.3.4) unstable; urgency=low
|
||||
postfixadmin (2.3.5-1) unstable; urgency=low
|
||||
|
||||
* New upstream release (2.3.4)
|
||||
* Initial Debian release (Closes: #247225)
|
||||
|
||||
-- David Goodwin <david.goodwin@palepurple.co.uk> Fri, 16 Sep 2011 19:33:00 +0100
|
||||
|
||||
postfixadmin (2.3.3) unstable; urgency=low
|
||||
|
||||
* New upstream release (2.3.3)
|
||||
|
||||
-- David Goodwin <david.goodwin@palepurple.co.uk> Mon, 14 Mar 2011 22:20:00 +0100
|
||||
|
||||
postfixadmin (2.3.2) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- David Goodwin <david.goodwin@palepurple.co.uk> Mon, 23 Aug 2010 11:24:00 +0100
|
||||
|
||||
postfixadmin (2.3.1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
* Updated .deb standards (thanks normes)
|
||||
|
||||
-- David Goodwin <david.goodwin@palepurple.co.uk> Thu, 08 Jul 2010 22:20:14 +0100
|
||||
|
||||
postfixadmin (2.3) unstable; urgency=low
|
||||
|
||||
* Initial release (Closes: #247225)
|
||||
|
||||
-- Norman Messtorff <normes@normes.org> Sun, 21 Feb 2010 22:36:26 +0200
|
||||
-- Norman Messtorff <normes@normes.org> Sun, 15 Jan 2012 12:27:28 +0100
|
||||
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
Index: postfixadmin-trunk/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
|
||||
@@ -23,7 +23,7 @@
|
||||
* Doing this implies you have changed this file as required.
|
||||
* i.e. configuring database etc; specifying setup.php password etc.
|
||||
*/
|
||||
-$CONF['configured'] = false;
|
||||
+$CONF['configured'] = true;
|
||||
|
||||
// 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,
|
||||
@@ -46,11 +46,11 @@
|
||||
// mysql = MySQL 3.23 and 4.0, 4.1 or 5
|
||||
// mysqli = MySQL 4.1+
|
||||
// pgsql = PostgreSQL
|
||||
-$CONF['database_type'] = 'mysql';
|
||||
-$CONF['database_host'] = 'localhost';
|
||||
-$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_';
|
||||
// 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
|
||||
|
||||
@ -0,0 +1,56 @@
|
||||
Description: This patch sets the dbconfig placeholders in config.inc.php.
|
||||
Forwarded: not-needed
|
||||
Author: Norman Messtorff <normes@normes.org>
|
||||
Last-Update: 2011-12-18
|
||||
|
||||
Index: postfixadmin-2.3/config.inc.php
|
||||
===================================================================
|
||||
--- postfixadmin-2.3.orig/config.inc.php 2012-01-14 12:42:16.000000000 +0100
|
||||
+++ postfixadmin-2.3/config.inc.php 2012-01-14 12:56:28.000000000 +0100
|
||||
@@ -16,6 +16,11 @@
|
||||
* Contains configuration options.
|
||||
*/
|
||||
|
||||
+// This loads the automatic generated DB credentials from /etc/postfixadmin/dbconfig.inc.php
|
||||
+require_once('dbconfig.inc.php');
|
||||
+if (!isset($dbserver) || empty($dbserver))
|
||||
+ $dbserver='localhost';
|
||||
+
|
||||
/*****************************************************************
|
||||
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
* You have to set $CONF['configured'] = true; before the
|
||||
@@ -23,7 +28,7 @@
|
||||
* Doing this implies you have changed this file as required.
|
||||
* i.e. configuring database etc; specifying setup.php password etc.
|
||||
*/
|
||||
-$CONF['configured'] = false;
|
||||
+$CONF['configured'] = true;
|
||||
|
||||
// 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,
|
||||
@@ -33,7 +38,7 @@
|
||||
// Postfix Admin Path
|
||||
// Set the location of your Postfix Admin installation here.
|
||||
// YOU MUST ENTER THE COMPLETE URL e.g. http://domain.tld/postfixadmin
|
||||
-$CONF['postfix_admin_url'] = '';
|
||||
+$CONF['postfix_admin_url'] = '/postfixadmin';
|
||||
|
||||
// shouldn't need changing.
|
||||
$CONF['postfix_admin_path'] = dirname(__FILE__);
|
||||
@@ -46,11 +51,11 @@
|
||||
// mysql = MySQL 3.23 and 4.0, 4.1 or 5
|
||||
// mysqli = MySQL 4.1+
|
||||
// pgsql = PostgreSQL
|
||||
-$CONF['database_type'] = 'mysql';
|
||||
-$CONF['database_host'] = 'localhost';
|
||||
-$CONF['database_user'] = 'postfix';
|
||||
-$CONF['database_password'] = 'postfixadmin';
|
||||
-$CONF['database_name'] = 'postfix';
|
||||
+$CONF['database_type'] = $dbtype;
|
||||
+$CONF['database_host'] = $dbserver;
|
||||
+$CONF['database_user'] = $dbuser;
|
||||
+$CONF['database_password'] = $dbpass;
|
||||
+$CONF['database_name'] = $dbname;
|
||||
// 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
|
||||
@ -1 +1 @@
|
||||
20110414_db-credentials
|
||||
db_credentials
|
||||
|
||||
@ -0,0 +1 @@
|
||||
3.0 (quilt)
|
||||
@ -0,0 +1,2 @@
|
||||
version=3
|
||||
http://sf.net/postfixadmin/postfixadmin_(.+)\.tar\.gz
|
||||
Loading…
Reference in New Issue