From a955b9389f17a5ceb85a3858c5990e55b55bd0e9 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 11 Apr 2025 17:04:51 -0600 Subject: [PATCH] Synchronize the grp templates --- .../provision/grandstream/grp2612w/{$mac}.xml | 40 ++++++++++-------- .../provision/grandstream/grp2613/{$mac}.xml | 10 ++--- .../provision/grandstream/grp2614/{$mac}.xml | 41 ++++++++++--------- .../provision/grandstream/grp2615/{$mac}.xml | 41 ++++++++++--------- .../provision/grandstream/grp2616/{$mac}.xml | 41 ++++++++++--------- 5 files changed, 92 insertions(+), 81 deletions(-) diff --git a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml index a7a50b2d21..294b7e256f 100644 --- a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml @@ -37,9 +37,9 @@ {if isset($row.server_address_primary)} - {$row.server_address_primary} + {$row.server_address_primary}:{$row.sip_port} {else} - {$row.server_address} + {$row.server_address}:{$row.sip_port} {/if} @@ -65,9 +65,9 @@ {if isset($row.server_address_primary)} - {$row.server_address_primary} + {$row.server_address_primary}:{$row.sip_port} {else} - {$row.server_address} + {$row.server_address}:{$row.sip_port} {/if} @@ -142,7 +142,7 @@ {$grandstream_nat_traversal} {else} Auto - {/if} + {/if} @@ -3760,12 +3760,20 @@ + {if isset($ntp_server_primary)} + {$ntp_server_primary} + {else} pool.ntp.org + {/if} - + {if isset($ntp_server_secondary)} + {$ntp_server_secondary} + {else} + 2.us.pool.ntp.org + {/if} @@ -4469,14 +4477,14 @@ - - - - - - - - + + + + + + + + @@ -4534,8 +4542,8 @@ - + + {foreach $keys['memory'] as $row} diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml index 498035f90d..294b7e256f 100644 --- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml @@ -907,21 +907,21 @@ - + *78 - + *79 - + *72 - + *73 @@ -1482,7 +1482,7 @@ - Off + Yes diff --git a/resources/templates/provision/grandstream/grp2614/{$mac}.xml b/resources/templates/provision/grandstream/grp2614/{$mac}.xml index 9126e7f867..294b7e256f 100644 --- a/resources/templates/provision/grandstream/grp2614/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2614/{$mac}.xml @@ -37,9 +37,9 @@ {if isset($row.server_address_primary)} - {$row.server_address_primary} + {$row.server_address_primary}:{$row.sip_port} {else} - {$row.server_address} + {$row.server_address}:{$row.sip_port} {/if} @@ -65,9 +65,9 @@ {if isset($row.server_address_primary)} - {$row.server_address_primary} + {$row.server_address_primary}:{$row.sip_port} {else} - {$row.server_address} + {$row.server_address}:{$row.sip_port} {/if} @@ -142,7 +142,7 @@ {$grandstream_nat_traversal} {else} Auto - {/if} + {/if} @@ -907,21 +907,21 @@ - + *78 - + *79 - + *72 - + *73 @@ -1482,7 +1482,7 @@ - Off + Yes @@ -3768,6 +3768,7 @@ + {if isset($ntp_server_secondary)} {$ntp_server_secondary} {else} @@ -4476,14 +4477,14 @@ - - - - - - - - + + + + + + + + @@ -4541,8 +4542,8 @@ - + + {foreach $keys['memory'] as $row} diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml index 9126e7f867..294b7e256f 100644 --- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2615/{$mac}.xml @@ -37,9 +37,9 @@ {if isset($row.server_address_primary)} - {$row.server_address_primary} + {$row.server_address_primary}:{$row.sip_port} {else} - {$row.server_address} + {$row.server_address}:{$row.sip_port} {/if} @@ -65,9 +65,9 @@ {if isset($row.server_address_primary)} - {$row.server_address_primary} + {$row.server_address_primary}:{$row.sip_port} {else} - {$row.server_address} + {$row.server_address}:{$row.sip_port} {/if} @@ -142,7 +142,7 @@ {$grandstream_nat_traversal} {else} Auto - {/if} + {/if} @@ -907,21 +907,21 @@ - + *78 - + *79 - + *72 - + *73 @@ -1482,7 +1482,7 @@ - Off + Yes @@ -3768,6 +3768,7 @@ + {if isset($ntp_server_secondary)} {$ntp_server_secondary} {else} @@ -4476,14 +4477,14 @@ - - - - - - - - + + + + + + + + @@ -4541,8 +4542,8 @@ - + + {foreach $keys['memory'] as $row} diff --git a/resources/templates/provision/grandstream/grp2616/{$mac}.xml b/resources/templates/provision/grandstream/grp2616/{$mac}.xml index 9126e7f867..294b7e256f 100644 --- a/resources/templates/provision/grandstream/grp2616/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2616/{$mac}.xml @@ -37,9 +37,9 @@ {if isset($row.server_address_primary)} - {$row.server_address_primary} + {$row.server_address_primary}:{$row.sip_port} {else} - {$row.server_address} + {$row.server_address}:{$row.sip_port} {/if} @@ -65,9 +65,9 @@ {if isset($row.server_address_primary)} - {$row.server_address_primary} + {$row.server_address_primary}:{$row.sip_port} {else} - {$row.server_address} + {$row.server_address}:{$row.sip_port} {/if} @@ -142,7 +142,7 @@ {$grandstream_nat_traversal} {else} Auto - {/if} + {/if} @@ -907,21 +907,21 @@ - + *78 - + *79 - + *72 - + *73 @@ -1482,7 +1482,7 @@ - Off + Yes @@ -3768,6 +3768,7 @@ + {if isset($ntp_server_secondary)} {$ntp_server_secondary} {else} @@ -4476,14 +4477,14 @@ - - - - - - - - + + + + + + + + @@ -4541,8 +4542,8 @@ - + + {foreach $keys['memory'] as $row}