diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 5c9ca37455..70282daf84 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,19 @@ +2011-09-23 Sancho Lerena + + * pandoradb_data.sql: Update version and DB Build. + + * DEBIAN/control, + DEBIAN/make_deb_package.sh + include/config.php + include/config_process.php + pandora_console_install + install.php + pandora_console.spec + pandora_console.redhat.spec: Updated version. + + * extras/pandoradb_migrate_v3.2_to_v4.0.sql: Update version after + migrate. + 2011-09-23 Miguel de Dios * operation/agentes/status_monitor.php: fixed the query for to don't show diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 697aa8f9a1..36b1701e0e 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 4.0RC1 +Version: 4.0 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 403c37eeb0..282a298040 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="4.0RC1" +pandora_version="4.0" package_pear=0 package_pandora=1 diff --git a/pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql b/pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql index edd61a8f4c..e51e0ad8fd 100644 --- a/pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql +++ b/pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql @@ -259,3 +259,7 @@ ALTER TABLE `talert_snmp` MODIFY COLUMN `custom_oid` text DEFAULT ''; -- Table `tconfig_os` -- ----------------------------------------------------- INSERT INTO `tconfig_os` (`name`, `description`, `icon_name`) VALUES ('VMware', 'VMware Architecture', 'so_vmware.png'); + +UPDATE tconfig SET value='4.0' WHERE token = 'db_scheme_version'; +UPDATE tconfig SET value='PD110923 (3.2 Migrate)' WHERE token = 'db_scheme_build'; + diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 4163c523c1..82e02ae8e8 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,8 +22,8 @@ /** * Pandora build version and version */ -$build_version = 'PC110819'; -$pandora_version = 'v4.0RC1'; +$build_version = 'PC110923'; +$pandora_version = 'v4.0'; date_default_timezone_set("Europe/Berlin"); diff --git a/pandora_console/install.php b/pandora_console/install.php index a12aadc624..191179c572 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -66,8 +66,8 @@ function ChangeDBAction(causer) {