webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-08-09 05:02:44 +03:00
Code Activity

improve config file loading when installed from a debian package

Browse Source
This commit is contained in:
David Goodwin
2017-09-19 13:24:13 +01:00
parent ae56c2b700
commit c5136c408d
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
debian/patches/config-debian.diff vendored
View File

@@ -1,13 +1,16 @@
Index: postfixadmin/config.inc.php
===================================================================
--- postfixadmin.orig/config.inc.php
+++ postfixadmin/config.inc.php
@@ -15,6 +15,12 @@
--- 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
+require_once(dirname(__FILE__) . '/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';
+}
@@ -15,7 +18,7 @@ Index: postfixadmin/config.inc.php
/*****************************************************************
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
* You have to set $CONF['configured'] = true; before the
@@ -22,7 +28,7 @@
@@ -22,7 +33,7 @@
* Doing this implies you have changed this file as required.
* i.e. configuring database etc; specifying setup.php password etc.
*/
@@ -24,7 +27,7 @@ Index: postfixadmin/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,
@@ -81,11 +87,11 @@ function language_hook($PALANG, $languag
@@ -81,11 +92,11 @@
// mysqli = MySQL 4.1+ or MariaDB
// pgsql = PostgreSQL
// sqlite = SQLite 3