Merge pull request #193 from wazo-platform/WP-991-SPA191-Update

miscellaneous fixes

change option for admin/user password
add profile rule A for local provisioning

Reviewed-by: Alexandre Fournier <None>

plugins/wazo-cisco-sip/11.1.0/plugin-info

@@ -1,5 +1,5 @@
 {
-    "version": "0.1.5",
+    "version": "0.1.6",
     "description": "Plugin for Cisco ATA 191 and 192 in version 11.1.0 of the SIP software.<br/> Please see the documentation if you want to install Cisco firmwares.",
     "description_fr": "Greffon pour Cisco ATA 191 et 192 en version 11.1.0 du logiciel SIP.<br/> Veuillez vous référer à la documentation pour l'installation de firmwares Cisco.",
     "capabilities": {

plugins/wazo-cisco-sip/11.1.0/templates/base.tpl

@@ -2,10 +2,12 @@
 <flat-profile>
 
 {% if admin_password is defined -%}
-<Admin_Password>{{ admin_password|e }}</Admin_Password>
+<Web_Login_Admin_Name>admin</Web_Login_Admin_Name>
+<Web_Login_Admin_Password>{{ admin_password|e }}</Web_Login_Admin_Password>
 {% endif -%}
 {% if user_password is defined -%}
-<User_Password>{{ user_password|e }}</User_Password>
+<Web_Login_Guest_Name>cisco</Web_Login_Guest_Name>
+<Web_Login_Guest_Password>{{ user_password|e }}</Web_Login_Guest_Password>
 {% endif -%}
 
 {% if dns_enabled -%}

plugins/wazo-cisco-sip/11.1.0/templates/common/model.cfg.tpl

@@ -1,7 +1,8 @@
 <?xml version="1.0" standalone="yes"?>
 <flat-profile>
-<Resync_On_Reset>Yes</Resync_On_Reset>
-<Resync_Periodic>3600</Resync_Periodic>
-<Profile_Rule_B>http://{{ ip }}:{{ http_port }}/spa-ata.xml?mac=$MA</Profile_Rule_B>
-<Profile_Rule_C>http://{{ ip }}:{{ http_port }}/$MA.xml</Profile_Rule_C>
+<Resync_On_Reset ua="na">Yes</Resync_On_Reset>
+<Resync_Periodic ua="na">3600</Resync_Periodic>
+<Profile_Rule ua="na">http://{{ ip }}:{{ http_port }}/ata$PSN.cfg</Profile_Rule>
+<Profile_Rule_B ua="na">http://{{ ip }}:{{ http_port }}/spa-ata.xml?mac=$MA</Profile_Rule_B>
+<Profile_Rule_C ua="na">http://{{ ip }}:{{ http_port }}/$MA.xml</Profile_Rule_C>
 </flat-profile>