From 1308c52355a60d83976403feb8513093a7934d83 Mon Sep 17 00:00:00 2001
From: David Goodwin <david@palepurple.co.uk>
Date: Wed, 2 May 2018 20:41:51 +0100
Subject: [PATCH] refresh debian patch

---
 debian/patches/config-debian.diff | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/patches/config-debian.diff b/debian/patches/config-debian.diff
index 56f58645..36e0e160 100644
--- a/debian/patches/config-debian.diff
+++ b/debian/patches/config-debian.diff
@@ -1,8 +1,8 @@
 --- a/config.inc.php
 +++ b/config.inc.php
-@@ -15,6 +15,17 @@
-  * Contains configuration options.
-  */
+@@ -31,6 +31,16 @@
+ ################################################################################
+ 
  
 +// Debian: This loads the automatic generated DB credentials from /etc/postfixadmin/dbconfig.inc.php
 +$db_config = dirname(__FILE__) . '/dbconfig.inc.php';
@@ -14,11 +14,10 @@
 +if (!isset($dbserver) || empty($dbserver)) {
 +    $dbserver = 'localhost';
 +}
-+
+ 
  /*****************************************************************
   *  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 
-  * You have to set $CONF['configured'] = true; before the
-@@ -22,7 +33,7 @@
+@@ -39,7 +49,7 @@
   * Doing this implies you have changed this file as required.
   * i.e. configuring database etc; specifying setup.php password etc.
   */
@@ -27,7 +26,7 @@
  
  // 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 @@
+@@ -98,11 +108,11 @@ function language_hook($PALANG, $language) {
  // mysqli = MySQL 4.1+ or MariaDB
  // pgsql = PostgreSQL
  // sqlite = SQLite 3
@@ -41,6 +40,6 @@
 +$CONF['database_user'] = $dbuser;
 +$CONF['database_password'] = $dbpass;
 +$CONF['database_name'] = $dbname;
-
+ 
  // Database SSL Config
  $CONF['database_use_ssl'] = false;