From: Peter Palfrader Date: Wed, 28 Dec 2016 10:38:04 +0000 (+0100) Subject: fix variable X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=960c845a346722dc7bfc8de8732dd4745b866cce;p=mirror%2Fdsa-puppet.git fix variable --- diff --git a/modules/debian-org/lib/facter/software.rb b/modules/debian-org/lib/facter/software.rb index ab33e629c..b8d8c7dfc 100644 --- a/modules/debian-org/lib/facter/software.rb +++ b/modules/debian-org/lib/facter/software.rb @@ -155,7 +155,7 @@ Facter.add("systemd") do end end end -Facter.add("tor_ge_0.2.9") do +Facter.add("tor_ge_0_2_9") do setcode do system(%{dpkg -l tor 2>/dev/null && dpkg --compare-versions $(dpkg-query -W -f='${Version}' tor) ge 0.2.9}) end diff --git a/modules/onion/templates/torrc-header.erb b/modules/onion/templates/torrc-header.erb index 356431cc0..2978f62ed 100644 --- a/modules/onion/templates/torrc-header.erb +++ b/modules/onion/templates/torrc-header.erb @@ -1,7 +1,7 @@ SocksPort 0 Log notice syslog -<%- if has_variable?("tor_ge_0.2.9") && tor_ge_0.2.9 == "true" -%> +<%- if has_variable?("tor_ge_0_2_9") && tor_ge_0_2_9 == "true" -%> HiddenServiceSingleHopMode 1 HiddenServiceNonAnonymousMode 1 <%- end -%>