summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--puppet/modules/obfsproxy/manifests/init.pp3
-rw-r--r--puppet/modules/obfsproxy/templates/etc_conf.erb2
2 files changed, 3 insertions, 2 deletions
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 %>