composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 18:48:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°1260 MySQL TLS connection : add options in setup

Browse Source 
SVN:trunk[5311]
This commit is contained in:
Pierre Goiffon
2018-02-08 14:21:51 +00:00
parent 3375629d06
commit 5a2576bc29
8 changed files with 608 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/config.class.inc.php
View File

@@ -148,24 +148,27 @@ class Config
),
'db_ssl.key' => array(
'type' => 'string',
'description' => 'Path to client key file for SSL',
'default' => null,
'value' => '',
'source_of_value' => '',
'show_in_conf_sample' => true,
'show_in_conf_sample' => false,
),
'db_ssl.cert' => array(
'type' => 'string',
'description' => 'Path to client certificate file for SSL',
'default' => null,
'value' => '',
'source_of_value' => '',
'show_in_conf_sample' => true,
'show_in_conf_sample' => false,
),
'db_ssl.ca' => array(
'type' => 'string',
'description' => 'Path to certificate authority file for SSL',
'default' => null,
'value' => '',
'source_of_value' => '',
'show_in_conf_sample' => true,
'show_in_conf_sample' => false,
),
'db_ssl.capath' => array(
'type' => 'string',
@@ -173,14 +176,15 @@ class Config
'default' => null,
'value' => '',
'source_of_value' => '',
'show_in_conf_sample' => true,
'show_in_conf_sample' => false,
),
'db_ssl.cipher' => array(
'type' => 'string',
'description' => 'Optional : separated list of permissible cyphers to use for SSL encryption',
'default' => null,
'value' => '',
'source_of_value' => '',
'show_in_conf_sample' => true,
'show_in_conf_sample' => false,
),
'db_character_set' => array(
'type' => 'string',
@@ -1877,7 +1881,7 @@ class Config
{
$this->Set('db_ssl.key', $aParamValues['db_ssl_key']);
}
if (isset($aParamValues['db_ssl_key']))
if (isset($aParamValues['db_ssl_cert']))
{
$this->Set('db_ssl.cert', $aParamValues['db_ssl_cert']);
}
@@ -1885,6 +1889,10 @@ class Config
{
$this->Set('db_ssl.ca', $aParamValues['db_ssl_ca']);
}
if (isset($aParamValues['db_ssl_capath']))
{
$this->Set('db_ssl.capath', $aParamValues['db_ssl_capath']);
}
if (isset($aParamValues['db_ssl_cipher']))
{
$this->Set('db_ssl.cipher', $aParamValues['db_ssl_cipher']);
@@ -1900,6 +1908,11 @@ class Config
$aSelectedModules = null;
}
$this->UpdateIncludes($sModulesDir, $aSelectedModules);
if (isset($aParamValues['source_dir']))
{
$this->Set('source_dir', $aParamValues['source_dir']);
}
}
/**