tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9521-Problema-conexión-Mysql-SSL-Azure' into 'develop' 

Ent 9521 problema conexión mysql ssl azure

See merge request artica/pandorafms!5164
This commit is contained in:
Daniel Rodriguez 2022-11-03 11:55:08 +00:00
parent e52da7d379 db09df249a
commit cd0839d688
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_server/conf/pandora_server.conf.new
View File

@ -747,3 +747,6 @@ alertserver_queue 0
tentacle_service_watchdog 1
# Enable (1) or disable (0) the parameter of mysql ssl certification (mysql_ssl_verify_server_cert) (enabled by default).
verify_mysql_ssl_cert 1

4
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -229,6 +229,7 @@ sub pandora_load_config {
$pa_config->{"dbssl"} = 0;
$pa_config->{"dbsslcapath"} = "";
$pa_config->{"dbsslcafile"} = "";
$pa_config->{"verify_mysql_ssl_cert"} = "0";
$pa_config->{"basepath"} = $pa_config->{'pandora_path'}; # Compatibility with Pandora 1.1
$pa_config->{"incomingdir"} = "/var/spool/pandora/data_in";
$pa_config->{"user"} = "pandora"; # environment settings default user owner for files generated
@ -724,6 +725,9 @@ sub pandora_load_config {
elsif ($parametro =~ m/^dbsslcafile\s(.*)/i) {
$pa_config->{'dbsslcafile'}= clean_blank($1);
}
elsif ($parametro =~ m/^verify_mysql_ssl_cert\s(.*)/i) {
$pa_config->{'verify_mysql_ssl_cert'}= clean_blank($1);
}
elsif ($parametro =~ m/^dbuser\s(.*)/i) {
$pa_config->{'dbuser'}= clean_blank($1);
}

5
pandora_server/lib/PandoraFMS/DB.pm
View File

@ -1665,9 +1665,12 @@ sub set_ssl_opts($) {
}
# Enable SSL.
$SSL_OPTS = "mysql_ssl=1;mysql_ssl_optional=1;mysql_ssl_verify_server_cert=1";
$SSL_OPTS = "mysql_ssl=1;mysql_ssl_optional=1";
# Set additional SSL options.
if (defined($pa_config->{'verify_mysql_ssl_cert'}) && $pa_config->{'verify_mysql_ssl_cert'} ne "") {
$SSL_OPTS .= ";mysql_ssl_verify_server_cert=" . $pa_config->{'verify_mysql_ssl_cert'};
}
if (defined($pa_config->{'dbsslcapath'}) && $pa_config->{'dbsslcapath'} ne "") {
$SSL_OPTS .= ";mysql_ssl_ca_path=" . $pa_config->{'dbsslcapath'};
}