projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add clementi
[mirror/dsa-puppet.git]
/
modules
/
debian-org
/
lib
/
facter
/
software.rb
diff --git
a/modules/debian-org/lib/facter/software.rb
b/modules/debian-org/lib/facter/software.rb
index
5c60dd4
..
533c779
100644
(file)
--- a/
modules/debian-org/lib/facter/software.rb
+++ b/
modules/debian-org/lib/facter/software.rb
@@
-93,15
+93,6
@@
Facter.add("policydweight") do
end
end
end
end
end
end
-Facter.add("vsftpd") do
- setcode do
- if FileTest.exist?("/usr/sbin/vsftpd")
- true
- else
- ''
- end
- end
-end
Facter.add("spamd") do
setcode do
if FileTest.exist?("/usr/sbin/spamd")
Facter.add("spamd") do
setcode do
if FileTest.exist?("/usr/sbin/spamd")
@@
-112,10
+103,10
@@
Facter.add("spamd") do
end
end
Facter.add("php5") 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/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
setcode do
if php
true
@@
-125,8
+116,8
@@
Facter.add("php5") do
end
end
Facter.add("php5suhosin") 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
setcode do
if suhosin
true
@@
-140,23
+131,19
@@
Facter.add("syslogversion") do
%x{dpkg-query -W -f='${Version}\n' syslog-ng | cut -b1-3}.chomp
end
end
%x{dpkg-query -W -f='${Version}\n' syslog-ng | cut -b1-3}.chomp
end
end
-Facter.add("rsyncd") do
+Facter.add("unbound") do
+ unbound=(FileTest.exist?("/usr/sbin/unbound") and
+ FileTest.exist?("/var/lib/unbound/root.key"))
setcode do
setcode do
- if
FileTest.exist?("/etc/rsyncd.conf")
+ if
unbound
true
else
''
end
end
end
true
else
''
end
end
end
-Facter.add("unbound") do
- unbound=FileTest.exist?("/usr/sbin/unbound") and
- FileTest.exist?("/var/lib/unbound/root.key")
+Facter.add("munin_async") do
setcode do
setcode do
- if unbound
- true
- else
- ''
- end
+ FileTest.exist?("/usr/share/munin/munin-async")
end
end
end
end