|
|
|
|
--- a/config.inc.php
|
|
|
|
|
+++ b/config.inc.php
|
|
|
|
|
@@ -15,6 +15,17 @@
|
|
|
|
|
* Contains configuration options.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
+// Debian: This loads the automatic generated DB credentials from /etc/postfixadmin/dbconfig.inc.php
|
|
|
|
|
+$db_config = dirname(__FILE__) . '/dbconfig.inc.php';
|
|
|
|
|
+if (file_exists($db_config) && !is_readable($db_config)) {
|
|
|
|
|
+ die("Could not read: $db_config\n");
|
|
|
|
|
+}
|
|
|
|
|
+require_once($db_config);
|
|
|
|
|
+
|
|
|
|
|
+if (!isset($dbserver) || empty($dbserver)) {
|
|
|
|
|
+ $dbserver = 'localhost';
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
/*****************************************************************
|
|
|
|
|
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
|
|
|
* You have to set $CONF['configured'] = true; before the
|
|
|
|
|
@@ -22,7 +33,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,
|
|
|
|
|
@@ -81,11 +92,11 @@
|
|
|
|
|
// mysqli = MySQL 4.1+ or MariaDB
|
|
|
|
|
// pgsql = PostgreSQL
|
|
|
|
|
// sqlite = SQLite 3
|
|
|
|
|
-$CONF['database_type'] = 'mysqli';
|
|
|
|
|
-$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;
|
|
|
|
|
|
|
|
|
|
// Database SSL Config
|
|
|
|
|
$CONF['database_use_ssl'] = false;
|
