diff --git a/.github/workflows/gitleaks.yml b/.github/workflows/gitleaks.yml index 294b4314c..11e3d1202 100644 --- a/.github/workflows/gitleaks.yml +++ b/.github/workflows/gitleaks.yml @@ -12,7 +12,7 @@ jobs: with: fetch-depth: 0 - - uses: gitleaks/gitleaks-action@83373cf2f8c4db6e24b41c1a9b086bb9619e9cd3 # v2.3.7 + - uses: gitleaks/gitleaks-action@ff98106e4c7b2bc287b24eaf42907196329070c7 # v2.3.9 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITLEAKS_LICENSE: "Centreon" diff --git a/connectors/vmware/changelog b/connectors/vmware/changelog index d571bb1d9..908ed453b 100644 --- a/connectors/vmware/changelog +++ b/connectors/vmware/changelog @@ -1,3 +1,6 @@ +2025-05-16 Olivier Mercier - 20250501 + * Fix: changed permissions for centreon_vmware.json config file. + 2024-12-05 Olivier Mercier - 3.4.0 * Enhancement: systemd service now takes its options from /etc/(default|sysconfig)/centreon_vmware. diff --git a/connectors/vmware/packaging/scripts/postinstall.sh b/connectors/vmware/packaging/scripts/postinstall.sh index afd22bdd1..b7b4dfecb 100644 --- a/connectors/vmware/packaging/scripts/postinstall.sh +++ b/connectors/vmware/packaging/scripts/postinstall.sh @@ -9,8 +9,8 @@ function migrateConfigFromPmToJson() { /usr/bin/centreon_vmware_convert_config_file "$perl_config_file_path" > "$json_config_file_path" mv "$perl_config_file_path" "${perl_config_file_path}.deprecated" fi - chown centreon: "$json_config_file_path" - chmod 640 "$json_config_file_path" + chown centreon-gorgone:centreon "$json_config_file_path" + chmod 660 "$json_config_file_path" } function applyToSystemD() { diff --git a/connectors/vmware/src/centreon/script/centreon_vmware.pm b/connectors/vmware/src/centreon/script/centreon_vmware.pm index 4aa2fa6f1..699cd22a7 100644 --- a/connectors/vmware/src/centreon/script/centreon_vmware.pm +++ b/connectors/vmware/src/centreon/script/centreon_vmware.pm @@ -54,7 +54,7 @@ BEGIN { use base qw(centreon::vmware::script); -my $VERSION = '3.4.0'; +my $VERSION = '20250501'; my %handlers = (TERM => {}, HUP => {}, CHLD => {}); my @load_modules = ( diff --git a/connectors/vmware/src/centreon/vmware/common.pm b/connectors/vmware/src/centreon/vmware/common.pm index a37bfe5ab..777aee3a0 100644 --- a/connectors/vmware/src/centreon/vmware/common.pm +++ b/connectors/vmware/src/centreon/vmware/common.pm @@ -45,7 +45,7 @@ sub init_response { my (%options) = @_; $manager_response->{code} = 0; - $manager_response->{vmware_connector_version} = '3.4.0'; + $manager_response->{vmware_connector_version} = '20250501'; $manager_response->{short_message} = 'OK'; $manager_response->{extra_message} = ''; $manager_response->{identity} = $options{identity} if (defined($options{identity})); diff --git a/src/database/oracle/dbi.pm b/src/database/oracle/dbi.pm index 8202f5eb6..2c2c2db29 100644 --- a/src/database/oracle/dbi.pm +++ b/src/database/oracle/dbi.pm @@ -26,6 +26,11 @@ use strict; use warnings; use POSIX qw(:signal_h); +BEGIN { + # ORACLE_HOME environment variable must be defined + $ENV{'ORACLE_HOME'} = '' unless $ENV{'ORACLE_HOME'}; +} + sub connect_oracle { my ($self, %options) = @_;