diff options
author | Micah Anderson <micah@riseup.net> | 2017-04-24 12:04:55 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2017-04-25 16:56:36 -0400 |
commit | 10d96b990af1d680e31c291a15c7b66a6522de89 (patch) | |
tree | 0a139bf866cd517f060e502ac29adf5c27f84225 /puppet/modules/tor/templates/torrc.directory.erb | |
parent | f5d1850e7b3831b1ee6374627bb403aa3858a320 (diff) |
git subrepo pull (merge) puppet/modules/tor
subrepo:
subdir: "puppet/modules/tor"
merged: "5ef29012"
upstream:
origin: "https://leap.se/git/puppet_tor"
branch: "master"
commit: "5ef29012"
git-subrepo:
version: "0.4.0"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2e78d5d"
Diffstat (limited to 'puppet/modules/tor/templates/torrc.directory.erb')
-rw-r--r-- | puppet/modules/tor/templates/torrc.directory.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/modules/tor/templates/torrc.directory.erb b/puppet/modules/tor/templates/torrc.directory.erb index 1af9f40f..c7dc4ab5 100644 --- a/puppet/modules/tor/templates/torrc.directory.erb +++ b/puppet/modules/tor/templates/torrc.directory.erb @@ -1,11 +1,11 @@ # directory listing -<% if port != '0' -%> +<% if @port != '0' -%> DirPort <%= @port %> <% end -%> <% listen_addresses.each do |listen_address| -%> DirListenAddress <%= listen_address %> <% end -%> <% if @port_front_page != '' -%> -DirPortFrontPage <%= port_front_page %> +DirPortFrontPage <%= @port_front_page %> <%- end -%> |