MR 28 and minor fixes
Former-commit-id: 99292ecb6401cf20066dd09188a32e24b9194b25
This commit is contained in:
parent
920786216b
commit
8004e096fd
|
@ -8,5 +8,5 @@ DELETE FROM `tevent_response` WHERE `name` LIKE 'Create Integria IMS&#
|
|||
|
||||
INSERT INTO `tnotification_source_user` (`id_source`, `id_user`, `enabled`, `also_mail`) VALUES ((SELECT `id` FROM `tnotification_source` WHERE `description`="Official communication"), "admin", 1, 0);
|
||||
INSERT INTO `tnotification_source_group` SELECT `id`,0 FROM `tnotification_source` WHERE `description`="Official communication";
|
||||
|
||||
UPDATE `tnotification_source` SET `enabled`=1 WHERE `description` = 'System status' OR `description` = 'Official communication';
|
||||
COMMIT;
|
||||
|
|
|
@ -2085,6 +2085,7 @@ INSERT INTO `tnotification_source_group` SELECT `id`,0 FROM `tnotification_sourc
|
|||
INSERT INTO `tnotification_user` (`id_mensaje`, `id_user`) SELECT `id_mensaje`, `id_usuario_destino` FROM `tmensajes` WHERE `id_usuario_destino` != '';
|
||||
INSERT INTO `tnotification_source_user` (`id_source`, `id_user`, `enabled`, `also_mail`) VALUES ((SELECT `id` FROM `tnotification_source` WHERE `description`="Official communication"), "admin", 1, 0);
|
||||
INSERT INTO `tnotification_source_group` SELECT `id`,0 FROM `tnotification_source` WHERE `description`="Official communication";
|
||||
UPDATE `tnotification_source` SET `enabled`=1 WHERE `description` = 'System status' OR `description` = 'Official communication';
|
||||
|
||||
-- ----------------------------------------------------------------------
|
||||
-- Add custom internal recon scripts
|
||||
|
|
|
@ -422,6 +422,21 @@ class ConsoleSupervisor
|
|||
$this->checkCronRunning();
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if instance is registered.
|
||||
* NOTIF.UPDATEMANAGER.REGISTRATION
|
||||
*/
|
||||
|
||||
$this->checkUpdateManagerRegistration();
|
||||
|
||||
/*
|
||||
* Check if there're new messages in UM.
|
||||
* NOTIF.UPDATEMANAGER.MESSAGES
|
||||
*/
|
||||
|
||||
if (update_manager_verify_registration()) {
|
||||
$this->getUMMessages();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -208,8 +208,7 @@ if (!isset($config['inventory_changes_blacklist'])) {
|
|||
if (!isset($config['url_update_manager'])) {
|
||||
config_update_value(
|
||||
'url_update_manager',
|
||||
// 'https://licensing.artica.es/pandoraupdate7/server.php'
|
||||
'https://172.17.0.3/server.php'
|
||||
'https://licensing.artica.es/pandoraupdate7/server.php'
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -1320,4 +1320,5 @@ INSERT INTO `tnotification_source_user` (`id_source`, `id_user`, `enabled`, `als
|
|||
|
||||
INSERT INTO `tnotification_source_group` SELECT `id`,0 FROM `tnotification_source` WHERE `description`="Official communication";
|
||||
|
||||
UPDATE `tnotification_source` SET `enabled`=1 WHERE `description` = 'System status' OR `description` = 'Official communication';
|
||||
|
||||
|
|
Loading…
Reference in New Issue