diff options
| author | irregulator <irregulator@riseup.net> | 2014-05-23 17:45:13 +0300 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-07-01 16:05:41 -0700 |
| commit | fedbb6dccf7bd78b0b2a507a817dacaef0b67ac3 (patch) | |
| tree | ac998f378e865581f7b9e9abd86eca6093d6adfd | |
| parent | 7a54923591125894440b9ff7020e4b413a1c6fb5 (diff) | |
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.
| -rw-r--r-- | puppet/modules/obfsproxy/manifests/init.pp | 3 | ||||
| -rw-r--r-- | puppet/modules/obfsproxy/templates/etc_conf.erb | 2 |
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 %> |