From 7312a444875e1bfe778439c4d99e59435c4d43ed Mon Sep 17 00:00:00 2001 From: saraxxin Date: Fri, 26 Jul 2019 02:02:40 +0200 Subject: [PATCH] New variables added for Aastra provisioning (#4388) * Create app_config.php Add new variables for Aastra phones to default settings * Rename app/app_config.php to app/aastra/app_config.php * Delete app_config.php * Create app_config.php Create new variables for Aastra phones. * Update app_config.php Moved Aastra variables to app/aastra/app_config.php * Update {$mac}.cfg --- app/aastra/app_config.php | 90 +++++++++++++++++++ app/provision/app_config.php | 24 ----- .../provision/aastra/673x/{$mac}.cfg | 32 +++---- 3 files changed, 107 insertions(+), 39 deletions(-) create mode 100644 app/aastra/app_config.php diff --git a/app/aastra/app_config.php b/app/aastra/app_config.php new file mode 100644 index 0000000000..bb1e0cdbb7 --- /dev/null +++ b/app/aastra/app_config.php @@ -0,0 +1,90 @@ + diff --git a/app/provision/app_config.php b/app/provision/app_config.php index 62d3016388..71a7311476 100644 --- a/app/provision/app_config.php +++ b/app/provision/app_config.php @@ -454,30 +454,6 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "spa secure call No or Yes"; $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c471163a-12fa-11e8-b642-0ed5f89f718b"; - $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; - $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "aastra_gmt_offset"; - $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; - $apps[$x]['default_settings'][$y]['default_setting_value'] = "0"; - $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; - $apps[$x]['default_settings'][$y]['default_setting_description'] = "Aastra timezone offset in minutes (e.g. 300 = GMT-5 = Eastern Standard Time)"; - $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c47117a2-12fa-11e8-b642-0ed5f89f718b"; - $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; - $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "aastra_time_format"; - $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; - $apps[$x]['default_settings'][$y]['default_setting_value'] = "0"; - $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; - $apps[$x]['default_settings'][$y]['default_setting_description'] = "Aastra clock format"; - $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c47119aa-12fa-11e8-b642-0ed5f89f718b"; - $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; - $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "aastra_date_format"; - $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; - $apps[$x]['default_settings'][$y]['default_setting_value'] = "0"; - $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; - $apps[$x]['default_settings'][$y]['default_setting_description'] = "Aastra date format"; - $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2672dbbc-2834-4e95-9ea9-e9ff6dc07838"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "user_password"; diff --git a/resources/templates/provision/aastra/673x/{$mac}.cfg b/resources/templates/provision/aastra/673x/{$mac}.cfg index 1003fe438c..31c313f7a9 100644 --- a/resources/templates/provision/aastra/673x/{$mac}.cfg +++ b/resources/templates/provision/aastra/673x/{$mac}.cfg @@ -16,21 +16,21 @@ #options simple menu: 1 # default is 0 == full options menu # === display date and time === -time format: 0 # 1 for 24 hr format -date format: 0 # 0 == WWW MMM DD, 1 == DD-MMM-YY, 2 == YYYY-MM-DD, see reference for others -time zone name: Custom # Check reference for list of named time zones on page 647, or set offset below -time zone minutes: 300 # Offset in minutes from GMT, 300 = GMT-5 = Eastern Standard Time, -120 = GMT+2 = Eastern European Time -#dst config: 3 # Day Light Savings, 0 == off, 1 == 30 min summertime, 2 == 1 hr summertime, 3 (default) == automatic -#dst minutes: 60 # amount of time to offset the clock in minutes -#dst [start|end] relative date: 1 # Specifies how to interpret the start and end day, month, and week parameters, 0 - absolute, 1 - relative -#dst start month: 3 # March -#dst start week: 2 # Second full week of month -#dst start day: 1 # Sunday -#dst start hour: 1 # 1am -#dst end month: 11 # November -#dst end week: 1 # First full week of month -#dst end day: 1 # Sunday -#dst end hour: 1 # 1am +time format: {$aastra_time_format} # 1 for 24 hr format +date format: {$aastra_date_format} # 0 == WWW MMM DD, 1 == DD-MMM-YY, 2 == YYYY-MM-DD, see reference for others +time zone name: Custom # Check reference for list of named time zones on page 647, or set offset below +time zone minutes: {$aastra_zone_minutes} # Offset in minutes from GMT, 300 = GMT-5 = Eastern Standard Time, -120 = GMT+2 = Eastern European Time +#dst config: 3 # Day Light Savings, 0 == off, 1 == 30 min summertime, 2 == 1 hr summertime, 3 (default) == automatic +#dst minutes: 60 # amount of time to offset the clock in minutes +#dst [start|end] relative date: 1 # Specifies how to interpret the start and end day, month, and week parameters, 0 - absolute, 1 - relative +#dst start month: 3 # March +#dst start week: 2 # Second full week of month +#dst start day: 1 # Sunday +#dst start hour: 1 # 1am +#dst end month: 11 # November +#dst end week: 1 # First full week of month +#dst end day: 1 # Sunday +#dst end hour: 1 # 1am # === display backlight === backlight mode: 1 # 0 == off, 1 == auto to turn off after period of inactivity @@ -112,6 +112,8 @@ sip intercom allow barge in: 0 #sips private key: tftp://{$domain_name}/aastra/phonesPrivateKey.pem # source and name of key file from configuration server #sips trusted certificates: tftp://{$domain_name}/aastra/phonesTrustedCert.pem # source and name of trusted certificates file from configuration server +sip customized codec:payload=18;ptime={$aastra_ptime};silsupp={$aastra_silence_suppression},payload=8;ptime={$aastra_ptime};silsupp={$aastra_silence_suppression} +sip silence suppression:{$aastra_sip_silence_suppression} # silence suppression: deactivated (0), activated (1); enabled on G.711 with CN(RFC3389) or G.729AB # ################# # SIP settings - per-line