From fedbb6dccf7bd78b0b2a507a817dacaef0b67ac3 Mon Sep 17 00:00:00 2001
From: irregulator <irregulator@riseup.net>
Date: Fri, 23 May 2014 17:45:13 +0300
Subject: Be able to specify log_level parameter for obfsproxy

log_level sets minimum logging severity of obfsproxy daemon, can
be error, warning, info, debug. Defaults to info.
---
 puppet/modules/obfsproxy/manifests/init.pp      | 3 ++-
 puppet/modules/obfsproxy/templates/etc_conf.erb | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'puppet/modules')

diff --git a/puppet/modules/obfsproxy/manifests/init.pp b/puppet/modules/obfsproxy/manifests/init.pp
index 9ba2d0fd..1ee44d6f 100644
--- a/puppet/modules/obfsproxy/manifests/init.pp
+++ b/puppet/modules/obfsproxy/manifests/init.pp
@@ -3,7 +3,8 @@ class obfsproxy (
   $port,
   $param,
   $dest_ip,
-  $dest_port
+  $dest_port,
+  $log_level = 'info'
 ){
 
   $user = 'obfsproxy'
diff --git a/puppet/modules/obfsproxy/templates/etc_conf.erb b/puppet/modules/obfsproxy/templates/etc_conf.erb
index 3313b326..d9938e1a 100644
--- a/puppet/modules/obfsproxy/templates/etc_conf.erb
+++ b/puppet/modules/obfsproxy/templates/etc_conf.erb
@@ -7,5 +7,5 @@ PARAM=--password=<%= @param %>
 <% else %>
 PARAM=<%= @param %>
 <% end %>
-LOG=info
+LOG=<%= @log_level %>
 
-- 
cgit v1.2.3