From: Stephen Gran Date: Tue, 14 Aug 2012 06:54:37 +0000 (+0100) Subject: I can't believe this makes a difference X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=77a6eae95d63ba4cf0125efc5f464dda3de0cf07;p=mirror%2Fdsa-puppet.git I can't believe this makes a difference Signed-off-by: Stephen Gran --- diff --git a/modules/debian-org/lib/facter/software.rb b/modules/debian-org/lib/facter/software.rb index 33f1c422b..d4e4e5642 100644 --- a/modules/debian-org/lib/facter/software.rb +++ b/modules/debian-org/lib/facter/software.rb @@ -103,10 +103,10 @@ Facter.add("spamd") do end end Facter.add("php5") do - php = FileTest.exist?("/usr/lib/apache2/modules/libphp5.so") or + php = (FileTest.exist?("/usr/lib/apache2/modules/libphp5.so") or FileTest.exist?("/usr/bin/php5") or FileTest.exist?("/usr/bin/php5-cgi") or - FileTest.exist?("/usr/lib/cgi-bin/php5") + FileTest.exist?("/usr/lib/cgi-bin/php5")) setcode do if php true @@ -116,8 +116,8 @@ Facter.add("php5") do end end Facter.add("php5suhosin") do - suhosin=FileTest.exist?("/usr/lib/php5/20060613/suhosin.so") or - FileTest.exist?("/usr/lib/php5/20060613+lfs/suhosin.so") + suhosin=(FileTest.exist?("/usr/lib/php5/20060613/suhosin.so") or + FileTest.exist?("/usr/lib/php5/20060613+lfs/suhosin.so")) setcode do if suhosin true @@ -132,8 +132,8 @@ Facter.add("syslogversion") do end end Facter.add("unbound") do - unbound=FileTest.exist?("/usr/sbin/unbound") and - FileTest.exist?("/var/lib/unbound/root.key") + unbound=(FileTest.exist?("/usr/sbin/unbound") and + FileTest.exist?("/var/lib/unbound/root.key")) setcode do if unbound true