|
|
@ -12,7 +12,7 @@ Index: postfixadmin/config.inc.php
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
+// This loads the automatic generated DB credentials from /etc/postfixadmin/dbconfig.inc.php
|
|
|
|
+// This loads the automatic generated DB credentials from /etc/postfixadmin/dbconfig.inc.php
|
|
|
|
+require_once('dbconfig.inc.php');
|
|
|
|
+require_once('/etc/postfixadmin/dbconfig.inc.php');
|
|
|
|
+if (!isset($dbserver) || empty($dbserver))
|
|
|
|
+if (!isset($dbserver) || empty($dbserver))
|
|
|
|
+ $dbserver='localhost';
|
|
|
|
+ $dbserver='localhost';
|
|
|
|
+
|
|
|
|
+
|
|
|
@ -32,7 +32,7 @@ Index: postfixadmin/config.inc.php
|
|
|
|
// mysql = MySQL 3.23 and 4.0, 4.1 or 5
|
|
|
|
// mysql = MySQL 3.23 and 4.0, 4.1 or 5
|
|
|
|
// mysqli = MySQL 4.1+
|
|
|
|
// mysqli = MySQL 4.1+
|
|
|
|
// pgsql = PostgreSQL
|
|
|
|
// pgsql = PostgreSQL
|
|
|
|
-$CONF['database_type'] = 'mysql';
|
|
|
|
-$CONF['database_type'] = 'mysqli';
|
|
|
|
-$CONF['database_host'] = 'localhost';
|
|
|
|
-$CONF['database_host'] = 'localhost';
|
|
|
|
-$CONF['database_user'] = 'postfix';
|
|
|
|
-$CONF['database_user'] = 'postfix';
|
|
|
|
-$CONF['database_password'] = 'postfixadmin';
|
|
|
|
-$CONF['database_password'] = 'postfixadmin';
|
|
|
|