diff options
| author | Micah <micah@riseup.net> | 2015-03-27 18:50:01 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2015-03-27 18:50:01 +0000 |
| commit | 3925f36f7cd0f15029304363b0f5749750627c96 (patch) | |
| tree | 5613a76af8c008a5820e41c097ed94f231412956 /templates/torrc.bridge.erb | |
| parent | a31579095231c68a2786955b9149d3bcd13400af (diff) | |
| parent | 19a44ce97f59633002d844e2b37f2b26b2f1cfbc (diff) | |
| download | puppet-tor-3925f36f7cd0f15029304363b0f5749750627c96.tar.gz puppet-tor-3925f36f7cd0f15029304363b0f5749750627c96.tar.bz2 | |
Merge branch 'improvements' into 'master'
Improvements
These are a bunch of improvements I got on my github profile in the past.
Interested in merging them?
Summary:
* adds tor repo management
* removes a workaround for a fixed bug
* adds tor-arm support
* support for safe logging
* puppet 3 ready templates.
It's merged on top of the current master.
See merge request !1
Diffstat (limited to 'templates/torrc.bridge.erb')
| -rw-r--r-- | templates/torrc.bridge.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/torrc.bridge.erb b/templates/torrc.bridge.erb index 58ef70d..559ce5d 100644 --- a/templates/torrc.bridge.erb +++ b/templates/torrc.bridge.erb @@ -1,3 +1,3 @@ -# Bridge <%= name%> -Bridge <%= ip%>:<%= port%><%- if fingerprint -%> <%= fingerprint%><%- end -%> +# Bridge <%= @name %> +Bridge <%= @ip %>:<%= @port %><% if @fingerprint -%> <%= @fingerprint%><% end -%> |