From ecb8fc2c5b3c1b42e15e3e44d287a650ef3b6aa6 Mon Sep 17 00:00:00 2001
From: A. Täffner <darkalex@firesplash.de>
Date: Wed, 27 Jan 2016 05:18:26 -0500
Subject: [PATCH] removed orphaned SPF type from one last file Added sone lines to rmeoting api description file for dns (I hope thats correct...)

---
 interface/lib/config.inc.php |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index a5915c7..907f372 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -51,6 +51,7 @@
 //** Database
 $conf['db_type'] = 'mysql';
 $conf['db_host'] = 'localhost';
+$conf['db_port'] = 3306;
 $conf['db_database'] = 'ispconfig3_305';
 $conf['db_user'] = 'root';
 $conf['db_password'] = '';
@@ -60,6 +61,7 @@
 
 define('DB_TYPE', $conf['db_type']);
 define('DB_HOST', $conf['db_host']);
+define('DB_PORT', $conf['db_port']);
 define('DB_DATABASE', $conf['db_database']);
 define('DB_USER', $conf['db_user']);
 define('DB_PASSWORD', $conf['db_password']);
@@ -69,6 +71,7 @@
 //** Database settings for the master DB. This setting is only used in multiserver setups
 $conf['dbmaster_type']   = 'mysql';
 $conf['dbmaster_host']   = '{mysql_master_server_host}';
+$conf['dbmaster_port']   = '{mysql_master_server_port}';
 $conf['dbmaster_database']  = '{mysql_master_server_database}';
 $conf['dbmaster_user']   = '{mysql_master_server_ispconfig_user}';
 $conf['dbmaster_password']  = '{mysql_master_server_ispconfig_password}';
@@ -139,6 +142,7 @@
 //** Default Language
 $conf['language'] = 'en';
 $conf['debug_language'] = false;
+$conf['language_file_import_enabled'] = true; // Bool value: true / false
 
 //** Default Country
 $conf['country'] = 'DE';

--
Gitblit v1.9.1