From bbc20747d22848382cc7e5e1a58924a97cb81bea Mon Sep 17 00:00:00 2001
From: Branko Kalanovic <bkalanovic@telesign.com>
Date: Mon, 10 Jun 2019 10:41:46 +0200
Subject: [PATCH] use_syslog option fixed

---
 data/common.yaml             |  4 ++--
 manifests/config.pp          |  4 ++--
 manifests/init.pp            |  2 +-
 templates/tinyproxy.conf.erb | 10 +++++++---
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/data/common.yaml b/data/common.yaml
index f4d4b43..a70fba9 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -11,8 +11,8 @@ tinyproxy::error_files: null
 tinyproxy::default_error_file: "/usr/share/tinyproxy/default.html"
 tinyproxy::stat_host: null
 tinyproxy::stat_file: "/usr/share/tinyproxy/stats.html"
-tinyproxy::log_file: "/var/log/tinyproxy/tinyproxy.log"
-tinyproxy::use_syslog: false
+tinyproxy::log_file: null
+tinyproxy::use_syslog: null
 tinyproxy::pid_file: "/var/run/tinyproxy/tinyproxy.pid"
 tinyproxy::use_xtinyproxy: false
 tinyproxy::default_upstreams: null
diff --git a/manifests/config.pp b/manifests/config.pp
index 8c9985e..c819be4 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -13,7 +13,7 @@
   Optional[String] $stat_host,
   String $stat_file,
   Optional[String] $log_file,
-  Boolean $use_syslog,
+  Optional[Boolean] $use_syslog,
   String $pid_file,
   Boolean $use_xtinyproxy,
   Optional[Array[String]] $default_upstreams,
@@ -44,7 +44,7 @@
 ){
 
   if $log_file != undef and $use_syslog == true {
-    fail('$use_syslog and $log_logfile are mutually exclusive.')
+    fail('$use_syslog and $log_file are mutually exclusive.')
   }
 
   file { $config_path:
diff --git a/manifests/init.pp b/manifests/init.pp
index 7f6eaef..0dab755 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -19,7 +19,7 @@
   Optional[String] $stat_host,
   String $stat_file,
   Optional[String] $log_file,
-  Boolean $use_syslog,
+  Optional[Boolean] $use_syslog,
   String $pid_file,
   Boolean $use_xtinyproxy,
   Optional[Array[String]] $default_upstreams,
diff --git a/templates/tinyproxy.conf.erb b/templates/tinyproxy.conf.erb
index c302931..b3293d0 100644
--- a/templates/tinyproxy.conf.erb
+++ b/templates/tinyproxy.conf.erb
@@ -114,7 +114,11 @@ StatFile "<%= @stat_file %>"
 # and enable the Syslog directive.  These directives are mutually
 # exclusive.
 #
-<%- if @log_file -%>
+<%- if @log_file.nil? and ( @use_syslog.nil? or ! @use_syslog ) -%>
+LogFile "/var/log/tinyproxy/tinyproxy.log"
+<%- elsif @use_syslog -%>
+# LogFile "/var/log/tinyproxy/tinyproxy.log"
+<%- else -%>
 LogFile "<%= @log_file %>"
 <%- end -%>
 
@@ -123,10 +127,10 @@ LogFile "<%= @log_file %>"
 # option must not be enabled if the Logfile directive is being used.
 # These two directives are mutually exclusive.
 #
-<%- if @syslog.nil? -%>
+<%- if @use_syslog.nil? -%>
 #Syslog On
 <%- else -%>
-Syslog <%= @syslog ? 'On' : 'Off' %>
+Syslog <%= @use_syslog ? 'On' : 'Off' %>
 <%- end -%>
 
 #