From 4fb914840b4b28c8678083c2801bea2abd829040 Mon Sep 17 00:00:00 2001 From: mattf Date: Mon, 2 Mar 2015 14:55:48 +0000 Subject: [PATCH] Release of 2.11 stable branch and raising trunk to 2.12 git-svn-id: svn://192.168.202.10@2293 3d104415-ff17-0410-8863-d5cf3c621b8a --- UPGRADE | 52 ++++++++++++++++++++++++++++++ extras/MySQL_AST_CREATE_tables.sql | 4 +-- extras/upgrade_2.12 | 3 ++ extras/upgrade_manifest.txt | 1 + version | 2 +- www/agc/vicidial.php | 5 +-- www/vicidial/admin.php | 5 +-- 7 files changed, 65 insertions(+), 7 deletions(-) create mode 100644 extras/upgrade_2.12 diff --git a/UPGRADE b/UPGRADE index 2931be16..293a4476 100644 --- a/UPGRADE +++ b/UPGRADE @@ -1,5 +1,6 @@ ################ UPGRADE +NOTE: Upgrading from 2.9 to 2.11 is below the first section NOTE: Upgrading from 2.7 to 2.9 is below the first section NOTE: Upgrading from 2.4 to 2.7 is below the first section NOTE: Upgrading from 2.2.1 to 2.4 is below the first section @@ -10,6 +11,57 @@ NOTE: Upgrading from 2.0.2 to 2.0.3 is below the fifth section NOTE: Upgrading from 2.0.1 to 2.0.2 is in the next section NOTE: Upgrading from 1.1.12-3 to 2.0.1 is at the bottom +########## UPGRADING FROM 2.11 TO 2.12 ########## + +OPTIONAL STEPS(But highly recommended) - Backup existing system: + +1. Run this for a 1-server system or server with database on it: + (this may take hours on large system) + /usr/share/astguiclient/ADMIN_backup.pl --debugX + +2. Run this on dialer/Asterisk-only servers: + (do not run this if you only have one server): + /usr/share/astguiclient/ADMIN_backup.pl --debugX --without-db --without-web + + +REQUIRED STEPS!!! + +1. Check system_settings, make sure you are at DB Schema Version 1403 or higher + If not, run the instructions for 2.9 to 2.11 before this section. + +2. upgrade the MySQL asterisk database(you have two options): + A. Running the upgrade file directly from Linux: + mysql -f --database=asterisk < /path/from/root/extras/upgrade_2.12.sql + + B. Going into mysql and executing the upgrade sql file: + mysql + use asterisk + \. /path/from/root/extras/upgrade_2.12.sql + quit + +3. install new files: + perl ./install.pl + NOTES: If you have customized any scripts in the bin or agi folders, + then make sure you back them up before running the install.pl script. + This script will replace existing files in the astguiclient installation. + +4. For each of your ViciDial servers, go the Admin -> Servers -> Modify Server + page and set each one to "Rebuild conf files = Y" and click submit. + This will rebuild the conf files to ensure any changes are updated. + +5. On one server only, update your phone codes data: + /usr/share/astguiclient/ADMIN_area_code_populate.pl --purge-table --debug + + +OTHER CHANGES: + +1. No new changes yet + + + + + + ########## UPGRADING FROM 2.9 TO 2.10 ########## OPTIONAL STEPS(But highly recommended) - Backup existing system: diff --git a/extras/MySQL_AST_CREATE_tables.sql b/extras/MySQL_AST_CREATE_tables.sql index 4b488d03..51fa4eca 100644 --- a/extras/MySQL_AST_CREATE_tables.sql +++ b/extras/MySQL_AST_CREATE_tables.sql @@ -3155,7 +3155,7 @@ INSERT INTO vicidial_inbound_groups(group_id,group_name,group_color,active,queue INSERT INTO vicidial_lists SET list_id='999',list_name='Default inbound list',campaign_id='TESTCAMP',active='N'; INSERT INTO vicidial_lists SET list_id='998',list_name='Default Manual list',campaign_id='TESTCAMP',active='N'; -INSERT INTO system_settings (version,install_date,first_login_trigger) values('2.10b0.5', CURDATE(), 'Y'); +INSERT INTO system_settings (version,install_date,first_login_trigger) values('2.12b0.5', CURDATE(), 'Y'); INSERT INTO vicidial_status_categories (vsc_id,vsc_name) values('UNDEFINED','Default Category'); @@ -3370,4 +3370,4 @@ UPDATE vicidial_configuration set value='1766' where name='qc_database_version'; UPDATE system_settings set vdc_agent_api_active='1'; -UPDATE system_settings SET db_schema_version='1403',db_schema_update_date=NOW(),reload_timestamp=NOW(); +UPDATE system_settings SET db_schema_version='1405',db_schema_update_date=NOW(),reload_timestamp=NOW(); diff --git a/extras/upgrade_2.12 b/extras/upgrade_2.12 new file mode 100644 index 00000000..4f5d012e --- /dev/null +++ b/extras/upgrade_2.12 @@ -0,0 +1,3 @@ +UPDATE system_settings SET db_schema_version='1404',version='2.11rc1tk',db_schema_update_date=NOW() where db_schema_version < 1404; + +UPDATE system_settings SET db_schema_version='1405',version='2.12b0.5',db_schema_update_date=NOW() where db_schema_version < 1405; diff --git a/extras/upgrade_manifest.txt b/extras/upgrade_manifest.txt index 12165bf6..25f01826 100644 --- a/extras/upgrade_manifest.txt +++ b/extras/upgrade_manifest.txt @@ -4,3 +4,4 @@ upgrade_2.4.sql 1193 upgrade_2.6.sql 1316 upgrade_2.8.sql 1347 upgrade_2.10.sql 1378 +upgrade_2.12.sql 1403 diff --git a/version b/version index f6d472ee..943bc403 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.10b0.5 +2.12b0.5 diff --git a/www/agc/vicidial.php b/www/agc/vicidial.php index fe37988b..5c586832 100644 --- a/www/agc/vicidial.php +++ b/www/agc/vicidial.php @@ -480,10 +480,11 @@ # 150212-0034 - Added case-sensitive user validation(issue #682) # 150218-1356 - Fixes for QXZ enclosed in single-quotes # 150220-1533 - Fix for leave page confirmation after logout and QXZ fixes +# 150302-0950 - Release of 2.11 stable branch and raising trunk to 2.12 # -$version = '2.10-451c'; -$build = '150220-1533'; +$version = '2.12-453c'; +$build = '150302-0950'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=85; $one_mysql_log=0; diff --git a/www/vicidial/admin.php b/www/vicidial/admin.php index a17190fc..19a22104 100644 --- a/www/vicidial/admin.php +++ b/www/vicidial/admin.php @@ -3437,12 +3437,13 @@ else # 150210-0657 - Added LOCK options for manual_dial_search_checkbox campaign setting # 150217-0702 - Added Show VM on Summary Screen option for phones and voicemail boxes # 150218-0924 - Added link to callbacks bulk move, also now we will archive deleted callbacks +# 150302-0951 - Release of 2.11 stable branch and raising trunk to 2.12 # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 9 to access this page the first time -$admin_version = '2.10-475a'; -$build = '150218-0924'; +$admin_version = '2.12-477a'; +$build = '150302-0951'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s");