From 48a6c29599026b07c6e148365ca1e41cebbc77ca Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Wed, 18 Mar 2026 16:40:24 +0000
Subject: [PATCH] Fix for Fanvil OutputDevice to allow an empty value -
 Reported that stdout could cause audio issue on some models so this provides
 an option to leave it empty. - Default the value to empty - Continued support
 for fanvil_syslog_enable

---
 app/fanvil/app_config.php                               | 8 ++++++++
 resources/templates/provision/fanvil/h2u-v2/{$mac}.cfg  | 8 +++++++-
 resources/templates/provision/fanvil/v67/{$mac}.cfg     | 8 +++++++-
 resources/templates/provision/fanvil/w611w/{$mac}.xml   | 8 +++++++-
 resources/templates/provision/fanvil/x1s/{$mac}.cfg     | 8 +++++++-
 resources/templates/provision/fanvil/x1sg/{$mac}.cfg    | 8 +++++++-
 resources/templates/provision/fanvil/x1sp/{$mac}.cfg    | 8 +++++++-
 resources/templates/provision/fanvil/x210/{$mac}.cfg    | 8 +++++++-
 resources/templates/provision/fanvil/x3sg/{$mac}.cfg    | 8 +++++++-
 resources/templates/provision/fanvil/x3sw/{$mac}.cfg    | 8 +++++++-
 resources/templates/provision/fanvil/x3u-pro/{$mac}.cfg | 8 +++++++-
 resources/templates/provision/fanvil/x3u/{$mac}.cfg     | 8 +++++++-
 resources/templates/provision/fanvil/x4sg/{$mac}.cfg    | 8 +++++++-
 resources/templates/provision/fanvil/x4u/{$mac}.cfg     | 8 +++++++-
 resources/templates/provision/fanvil/x5s/{$mac}.cfg     | 8 +++++++-
 resources/templates/provision/fanvil/x5u/{$mac}.cfg     | 8 +++++++-
 resources/templates/provision/fanvil/x6/{$mac}.cfg      | 8 +++++++-
 resources/templates/provision/fanvil/x6u/{$mac}.cfg     | 8 +++++++-
 resources/templates/provision/fanvil/x7/{$mac}.cfg      | 8 +++++++-
 resources/templates/provision/fanvil/x7a/{$mac}.cfg     | 8 +++++++-
 resources/templates/provision/fanvil/x7c/{$mac}.cfg     | 8 +++++++-
 21 files changed, 148 insertions(+), 20 deletions(-)

diff --git a/app/fanvil/app_config.php b/app/fanvil/app_config.php
index 73cfec5b83..0b8f452a3a 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 c1b773fdb8..b68570fbac 100644
--- a/resources/templates/provision/fanvil/h2u-v2/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/h2u-v2/{$mac}.cfg
@@ -1463,7 +1463,13 @@
     <log>
         <Level>ERROR</Level>
         <Style>level,tag</Style>
-        <OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/v67/{$mac}.cfg b/resources/templates/provision/fanvil/v67/{$mac}.cfg
index 294add5a85..b9399bc34d 100644
--- a/resources/templates/provision/fanvil/v67/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/v67/{$mac}.cfg
@@ -1751,7 +1751,13 @@
     <log>
         <Level>INFO</Level>
         <Style>level,tag</Style>
-        <OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/w611w/{$mac}.xml b/resources/templates/provision/fanvil/w611w/{$mac}.xml
index 0817b936d6..1cc1b79988 100644
--- a/resources/templates/provision/fanvil/w611w/{$mac}.xml
+++ b/resources/templates/provision/fanvil/w611w/{$mac}.xml
@@ -1235,7 +1235,13 @@
     <log>
         <Level>ERROR</Level>
         <Style>level,tag</Style>
-        <OutputDevice>stdout</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/x1s/{$mac}.cfg b/resources/templates/provision/fanvil/x1s/{$mac}.cfg
index 950abc797a..486ff8187e 100644
--- a/resources/templates/provision/fanvil/x1s/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x1s/{$mac}.cfg
@@ -1114,7 +1114,13 @@
     <log>
         <Level>ERROR</Level>
         <Style>level,tag</Style>
-        <OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/x1sg/{$mac}.cfg b/resources/templates/provision/fanvil/x1sg/{$mac}.cfg
index 950abc797a..486ff8187e 100644
--- a/resources/templates/provision/fanvil/x1sg/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x1sg/{$mac}.cfg
@@ -1114,7 +1114,13 @@
     <log>
         <Level>ERROR</Level>
         <Style>level,tag</Style>
-        <OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/x1sp/{$mac}.cfg b/resources/templates/provision/fanvil/x1sp/{$mac}.cfg
index 950abc797a..486ff8187e 100644
--- a/resources/templates/provision/fanvil/x1sp/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x1sp/{$mac}.cfg
@@ -1114,7 +1114,13 @@
     <log>
         <Level>ERROR</Level>
         <Style>level,tag</Style>
-        <OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/x210/{$mac}.cfg b/resources/templates/provision/fanvil/x210/{$mac}.cfg
index d8d33b0d2a..afdb4e57d4 100644
--- a/resources/templates/provision/fanvil/x210/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x210/{$mac}.cfg
@@ -4142,7 +4142,13 @@
     <log>
         <Level>INFO</Level>
         <Style>level,tag</Style>
-        <OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/x3sg/{$mac}.cfg b/resources/templates/provision/fanvil/x3sg/{$mac}.cfg
index c1b773fdb8..b68570fbac 100644
--- a/resources/templates/provision/fanvil/x3sg/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x3sg/{$mac}.cfg
@@ -1463,7 +1463,13 @@
     <log>
         <Level>ERROR</Level>
         <Style>level,tag</Style>
-        <OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/x3sw/{$mac}.cfg b/resources/templates/provision/fanvil/x3sw/{$mac}.cfg
index c1b773fdb8..b68570fbac 100644
--- a/resources/templates/provision/fanvil/x3sw/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x3sw/{$mac}.cfg
@@ -1463,7 +1463,13 @@
     <log>
         <Level>ERROR</Level>
         <Style>level,tag</Style>
-        <OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/x3u-pro/{$mac}.cfg b/resources/templates/provision/fanvil/x3u-pro/{$mac}.cfg
index c1b773fdb8..b68570fbac 100644
--- a/resources/templates/provision/fanvil/x3u-pro/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x3u-pro/{$mac}.cfg
@@ -1463,7 +1463,13 @@
     <log>
         <Level>ERROR</Level>
         <Style>level,tag</Style>
-        <OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/x3u/{$mac}.cfg b/resources/templates/provision/fanvil/x3u/{$mac}.cfg
index e0413db775..eadd472465 100644
--- a/resources/templates/provision/fanvil/x3u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x3u/{$mac}.cfg
@@ -1794,7 +1794,13 @@
     <log>
         <Level>ERROR</Level>
         <Style>level,tag</Style>
-        <OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/x4sg/{$mac}.cfg b/resources/templates/provision/fanvil/x4sg/{$mac}.cfg
index 615c3f5a4e..3b4227012c 100644
--- a/resources/templates/provision/fanvil/x4sg/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x4sg/{$mac}.cfg
@@ -1777,7 +1777,13 @@
     <log>
         <Level>ERROR</Level>
         <Style>level,tag</Style>
-        <OutputDevice></OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/x4u/{$mac}.cfg b/resources/templates/provision/fanvil/x4u/{$mac}.cfg
index 4060636763..47e2387715 100644
--- a/resources/templates/provision/fanvil/x4u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x4u/{$mac}.cfg
@@ -2849,7 +2849,13 @@
     <log>
         <Level>INFO</Level>
         <Style>level,tag</Style>
-        <OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/x5s/{$mac}.cfg b/resources/templates/provision/fanvil/x5s/{$mac}.cfg
index 321b0a6933..8050265ab6 100644
--- a/resources/templates/provision/fanvil/x5s/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x5s/{$mac}.cfg
@@ -1685,7 +1685,13 @@
     <log>
         <Level>INFO</Level>
         <Style>level,tag</Style>
-        <OutputDevice>stdout{if $fanvil_syslog_enable == '1'},syslog{else}{/if}</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/x5u/{$mac}.cfg b/resources/templates/provision/fanvil/x5u/{$mac}.cfg
index f048ef371e..2da55c4157 100644
--- a/resources/templates/provision/fanvil/x5u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x5u/{$mac}.cfg
@@ -3495,7 +3495,13 @@
     <log>
         <Level>INFO</Level>
         <Style>level,tag</Style>
-        <OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg
index 63bbe9b3a1..dd1999623b 100644
--- a/resources/templates/provision/fanvil/x6/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg
@@ -1671,7 +1671,13 @@
     <log>
         <Level>INFO</Level>
         <Style>level,tag</Style>
-        <OutputDevice>stdout{if $fanvil_syslog_enable == '1'},syslog{else}{/if}</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/x6u/{$mac}.cfg b/resources/templates/provision/fanvil/x6u/{$mac}.cfg
index 521cc8233d..33a83cbe14 100644
--- a/resources/templates/provision/fanvil/x6u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6u/{$mac}.cfg
@@ -4148,7 +4148,13 @@
     <log>
         <Level>INFO</Level>
         <Style>level,tag</Style>
-        <OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/x7/{$mac}.cfg b/resources/templates/provision/fanvil/x7/{$mac}.cfg
index 656ec9b74a..dce46fda26 100644
--- a/resources/templates/provision/fanvil/x7/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x7/{$mac}.cfg
@@ -4140,7 +4140,13 @@
     <log>
         <Level>INFO</Level>
         <Style>level,tag</Style>
-        <OutputDevice>stdout</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/x7a/{$mac}.cfg b/resources/templates/provision/fanvil/x7a/{$mac}.cfg
index 706b38d522..0560d4b72b 100644
--- a/resources/templates/provision/fanvil/x7a/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x7a/{$mac}.cfg
@@ -3958,7 +3958,13 @@
     <log>
         <Level>INFO</Level>
         <Style>level,tag</Style>
-        <OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
diff --git a/resources/templates/provision/fanvil/x7c/{$mac}.cfg b/resources/templates/provision/fanvil/x7c/{$mac}.cfg
index ea5f5000fb..f6140b1fbe 100644
--- a/resources/templates/provision/fanvil/x7c/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x7c/{$mac}.cfg
@@ -4140,7 +4140,13 @@
     <log>
         <Level>INFO</Level>
         <Style>level,tag</Style>
-        <OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
+        {if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
+        {elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
+        {elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
+        {/if}
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>