mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2024-09-20 03:36:20 +02:00
57b28f1ae2
- remove the (now superfluous) $CONF['postfix_admin_url'] config option debian/patches/db_credentials: - remove the section that sets $CONF['postfix_admin_url'] functions.inc.php - authentication_require_role(): - also remove $CONF['postfix_admin_url'] from comments - remove the './' part from the redirect Combined with the previous two commits, this fixes https://sourceforge.net/tracker/?func=detail&aid=3039042&group_id=191583&atid=937964 git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1396 a1433add-5e2c-0410-b055-b7f2511e0802
48 lines
1.9 KiB
Plaintext
48 lines
1.9 KiB
Plaintext
Description: This patch sets the dbconfig placeholders in config.inc.php.
|
|
Forwarded: not-needed
|
|
Author: Norman Messtorff <normes@normes.org>
|
|
Last-Update: 2012-05-28
|
|
|
|
Index: postfixadmin/config.inc.php
|
|
===================================================================
|
|
--- postfixadmin.orig/config.inc.php 2011-12-18 05:22:05.000000000 +0100
|
|
+++ postfixadmin/config.inc.php 2011-12-18 05:31:16.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,
|
|
@@ -85,11 +90,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
|