Merge branch 'obfs4' into 'master'

Add support for Server Transport Plugins (like obsf4proxy)

See merge request shared-puppet-modules-group/tor!15

2 files changed, 26 insertions, 0 deletions

diff --git a/manifests/daemon/transport_plugin.pp b/manifests/daemon/transport_plugin.pp
new file mode 100644
index 0000000..7242e5e
--- /dev/null
+++ b/manifests/daemon/transport_plugin.pp
@@ -0,0 +1,13 @@
+# transport plugin
+define tor::daemon::transport_plugin(
+  $servertransport_plugin     = '',
+  $servertransport_listenaddr = '',
+  $servertransport_options    = '',
+  $ext_port                   = '' ) {
+
+  concat::fragment { "11.transport_plugin":
+    content => template('tor/torrc.transport_plugin.erb'),
+    order   => 11,
+    target  => $tor::daemon::config_file,
+  }
+}
diff --git a/templates/torrc.transport_plugin.pp b/templates/torrc.transport_plugin.pp
new file mode 100644
index 0000000..d57f0e8
--- /dev/null
+++ b/templates/torrc.transport_plugin.pp
@@ -0,0 +1,13 @@
+# transport plugin
+<% if @servertransport_plugin != '' -%>
+ServerTransportPlugin <%= @servertransport_plugin %>
+<% end -%>
+<% if @servertransport_listenaddr != '' -%>
+ServerTransportListenAddr <%= @servertransport_listenaddr %>
+<% end -%>
+<% if @servertransport_options != '' -%>
+ServerTransportOptions <%= @servertransport_options %>
+<% end -%>
+<% if @ext_port != '' -%>
+ExtORPort <%= @ext_port %>
+<% end -%>