diff --git a/app/fanvil/app_config.php b/app/fanvil/app_config.php index 604816776..91a78ada9 100644 --- a/app/fanvil/app_config.php +++ b/app/fanvil/app_config.php @@ -384,6 +384,14 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable video codec on sip lines (Only h264 currently supported)"; $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b8abb3db-5c57-4c13-9fac-71e9743ca3e9"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_output_device"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = ""; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Output device allows an empty value (default), syslog and stdout"; + $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "be8c1341-3cb6-4aa8-bef5-642ff11199e8"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_syslog_enable"; diff --git a/resources/templates/provision/fanvil/h2u-v2/{$mac}.cfg b/resources/templates/provision/fanvil/h2u-v2/{$mac}.cfg index c1b773fdb..b68570fba 100644 --- a/resources/templates/provision/fanvil/h2u-v2/{$mac}.cfg +++ b/resources/templates/provision/fanvil/h2u-v2/{$mac}.cfg @@ -1463,7 +1463,13 @@ ERROR - {if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if} + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/v67/{$mac}.cfg b/resources/templates/provision/fanvil/v67/{$mac}.cfg index 294add5a8..b9399bc34 100644 --- a/resources/templates/provision/fanvil/v67/{$mac}.cfg +++ b/resources/templates/provision/fanvil/v67/{$mac}.cfg @@ -1751,7 +1751,13 @@ INFO - {if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if} + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/w611w/{$mac}.xml b/resources/templates/provision/fanvil/w611w/{$mac}.xml index 0817b936d..1cc1b7998 100644 --- a/resources/templates/provision/fanvil/w611w/{$mac}.xml +++ b/resources/templates/provision/fanvil/w611w/{$mac}.xml @@ -1235,7 +1235,13 @@ ERROR - stdout + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/x1s/{$mac}.cfg b/resources/templates/provision/fanvil/x1s/{$mac}.cfg index 950abc797..486ff8187 100644 --- a/resources/templates/provision/fanvil/x1s/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x1s/{$mac}.cfg @@ -1114,7 +1114,13 @@ ERROR - {if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if} + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/x1sg/{$mac}.cfg b/resources/templates/provision/fanvil/x1sg/{$mac}.cfg index 950abc797..486ff8187 100644 --- a/resources/templates/provision/fanvil/x1sg/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x1sg/{$mac}.cfg @@ -1114,7 +1114,13 @@ ERROR - {if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if} + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/x1sp/{$mac}.cfg b/resources/templates/provision/fanvil/x1sp/{$mac}.cfg index 950abc797..486ff8187 100644 --- a/resources/templates/provision/fanvil/x1sp/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x1sp/{$mac}.cfg @@ -1114,7 +1114,13 @@ ERROR - {if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if} + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/x210/{$mac}.cfg b/resources/templates/provision/fanvil/x210/{$mac}.cfg index d8d33b0d2..afdb4e57d 100644 --- a/resources/templates/provision/fanvil/x210/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x210/{$mac}.cfg @@ -4142,7 +4142,13 @@ INFO - {if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if} + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/x3sg/{$mac}.cfg b/resources/templates/provision/fanvil/x3sg/{$mac}.cfg index c1b773fdb..b68570fba 100644 --- a/resources/templates/provision/fanvil/x3sg/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x3sg/{$mac}.cfg @@ -1463,7 +1463,13 @@ ERROR - {if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if} + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/x3sw/{$mac}.cfg b/resources/templates/provision/fanvil/x3sw/{$mac}.cfg index c1b773fdb..b68570fba 100644 --- a/resources/templates/provision/fanvil/x3sw/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x3sw/{$mac}.cfg @@ -1463,7 +1463,13 @@ ERROR - {if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if} + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/x3u-pro/{$mac}.cfg b/resources/templates/provision/fanvil/x3u-pro/{$mac}.cfg index c1b773fdb..b68570fba 100644 --- a/resources/templates/provision/fanvil/x3u-pro/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x3u-pro/{$mac}.cfg @@ -1463,7 +1463,13 @@ ERROR - {if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if} + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/x3u/{$mac}.cfg b/resources/templates/provision/fanvil/x3u/{$mac}.cfg index e0413db77..eadd47246 100644 --- a/resources/templates/provision/fanvil/x3u/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x3u/{$mac}.cfg @@ -1794,7 +1794,13 @@ ERROR - {if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if} + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/x4sg/{$mac}.cfg b/resources/templates/provision/fanvil/x4sg/{$mac}.cfg index 615c3f5a4..3b4227012 100644 --- a/resources/templates/provision/fanvil/x4sg/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x4sg/{$mac}.cfg @@ -1777,7 +1777,13 @@ ERROR - + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/x4u/{$mac}.cfg b/resources/templates/provision/fanvil/x4u/{$mac}.cfg index 406063676..47e238771 100644 --- a/resources/templates/provision/fanvil/x4u/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x4u/{$mac}.cfg @@ -2849,7 +2849,13 @@ INFO - {if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if} + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/x5s/{$mac}.cfg b/resources/templates/provision/fanvil/x5s/{$mac}.cfg index 321b0a693..8050265ab 100644 --- a/resources/templates/provision/fanvil/x5s/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x5s/{$mac}.cfg @@ -1685,7 +1685,13 @@ INFO - stdout{if $fanvil_syslog_enable == '1'},syslog{else}{/if} + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/x5u/{$mac}.cfg b/resources/templates/provision/fanvil/x5u/{$mac}.cfg index f048ef371..2da55c415 100644 --- a/resources/templates/provision/fanvil/x5u/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x5u/{$mac}.cfg @@ -3495,7 +3495,13 @@ INFO - {if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if} + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg index 63bbe9b3a..dd1999623 100644 --- a/resources/templates/provision/fanvil/x6/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg @@ -1671,7 +1671,13 @@ INFO - stdout{if $fanvil_syslog_enable == '1'},syslog{else}{/if} + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/x6u/{$mac}.cfg b/resources/templates/provision/fanvil/x6u/{$mac}.cfg index 521cc8233..33a83cbe1 100644 --- a/resources/templates/provision/fanvil/x6u/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x6u/{$mac}.cfg @@ -4148,7 +4148,13 @@ INFO - {if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if} + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/x7/{$mac}.cfg b/resources/templates/provision/fanvil/x7/{$mac}.cfg index 656ec9b74..dce46fda2 100644 --- a/resources/templates/provision/fanvil/x7/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x7/{$mac}.cfg @@ -4140,7 +4140,13 @@ INFO - stdout + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/x7a/{$mac}.cfg b/resources/templates/provision/fanvil/x7a/{$mac}.cfg index 706b38d52..0560d4b72 100644 --- a/resources/templates/provision/fanvil/x7a/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x7a/{$mac}.cfg @@ -3958,7 +3958,13 @@ INFO - {if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if} + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform diff --git a/resources/templates/provision/fanvil/x7c/{$mac}.cfg b/resources/templates/provision/fanvil/x7c/{$mac}.cfg index ea5f5000f..f6140b1fb 100644 --- a/resources/templates/provision/fanvil/x7c/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x7c/{$mac}.cfg @@ -4140,7 +4140,13 @@ INFO - {if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if} + {if $fanvil_syslog_enable == '1'}syslog + {elseif $fanvil_output_device == ''} + {elseif $fanvil_output_device == 'syslog'}syslog + {elseif $fanvil_output_device == 'stdout'}stdout + {elseif $fanvil_output_device == 'syslog,stdout'}syslog,stdout + {elseif $fanvil_output_device == 'stdout,syslog'}syslog,stdout + {/if} platform.log 512KB platform