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

Merge branch '253-bit-de-licencia-ux-para-pandora-7' into 'develop' 

Update the Update Manager URLs.

See merge request !157
This commit is contained in:
nramon 2017-02-15 16:10:07 +01:00
parent 68bdcdd74f 165b59656e
commit 97f5254956
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
View File

@ -157,6 +157,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge
INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 0);
UPDATE tconfig SET value = 'https://firefly.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
-- ---------------------------------------------------------------------
-- Table `tplanned_downtime_agents`

3
pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
View File

@ -80,6 +80,7 @@ INSERT INTO tconfig (token, value) VALUES ('big_operation_step_datos_purge', '10
INSERT INTO tconfig (token, value) VALUES ('small_operation_step_datos_purge', '1000');
INSERT INTO tconfig (token, value) VALUES ('days_autodisable_deletion', '30');
INSERT INTO tconfig (token, value) VALUES ('MR', 0);
UPDATE tconfig SET value = 'https://firefly.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
-- ---------------------------------------------------------------------
-- Table `tplanned_downtime_agents`
@ -157,4 +158,4 @@ ALTER TABLE tgraph ADD COLUMN percentil int(4) unsigned default '0';
-- ---------------------------------------------------------------------
-- Table `tnetflow_filter`
-- ---------------------------------------------------------------------
ALTER TABLE tnetflow_filter ADD COLUMN router_ip CLOB DEFAULT "";
ALTER TABLE tnetflow_filter ADD COLUMN router_ip CLOB DEFAULT "";

2
pandora_console/include/config_process.php
View File

@ -161,7 +161,7 @@ if (!isset($config['inventory_changes_blacklist'])) {
//NEW UPDATE MANAGER URL
if (!isset($config['url_update_manager'])) {
config_update_value('url_update_manager',
'https://firefly.artica.es/pandoraupdate6/server.php');
'https://firefly.artica.es/pandoraupdate7/server.php');
}
if (defined('METACONSOLE')) {

2
pandora_console/include/functions_update_manager.php
View File

@ -293,7 +293,7 @@ function update_manager_check_online_free_packages ($is_ajax=true) {
//For to test in the shell
/*
wget https://artica.es/pandoraupdate6/server.php -O- --no-check-certificate --post-data "action=newest_package&license=PANDORA_FREE&limit_count=1&current_package=1&version=v5.1RC1&build=PC140625"
wget https://artica.es/pandoraupdate7/server.php -O- --no-check-certificate --post-data "action=newest_package&license=PANDORA_FREE&limit_count=1&current_package=1&version=v5.1RC1&build=PC140625"
*/
$curlObj = curl_init();