projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix log directory permissions, add dependency to libapache2-mod-dacs
[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
b9d3e47
..
598d7a1
100644
(file)
--- a/
modules/debian-org/lib/facter/software.rb
+++ b/
modules/debian-org/lib/facter/software.rb
@@
-28,6
+28,16
@@
Facter.add("postgres83") do
FileTest.exist?("/usr/lib/postgresql/8.3/bin/postgres")
end
end
FileTest.exist?("/usr/lib/postgresql/8.3/bin/postgres")
end
end
+Facter.add("postgres84") do
+ setcode do
+ FileTest.exist?("/usr/lib/postgresql/8.4/bin/postgres")
+ end
+end
+Facter.add("postgres90") do
+ setcode do
+ FileTest.exist?("/usr/lib/postgresql/9.0/bin/postgres")
+ end
+end
Facter.add("postgrey") do
setcode do
FileTest.exist?("/usr/sbin/postgrey")
Facter.add("postgrey") do
setcode do
FileTest.exist?("/usr/sbin/postgrey")
@@
-69,7
+79,7
@@
Facter.add("php5suhosin") do
end
Facter.add("syslogversion") do
setcode do
end
Facter.add("syslogversion") do
setcode do
- %x{dpkg-query -W -f='${Version}\n' syslog-ng | cut -b1}.chomp
+ %x{dpkg-query -W -f='${Version}\n' syslog-ng | cut -b1
-3
}.chomp
end
end
Facter.add("rsyncd") do
end
end
Facter.add("rsyncd") do
@@
-83,15
+93,3
@@
Facter.add("unbound") do
FileTest.exist?("/var/lib/unbound/root.key")
end
end
FileTest.exist?("/var/lib/unbound/root.key")
end
end
-Facter.add("release") do
- setcode do
- r = %x{lsb_release --short --codename}.chomp
- if r == "n/a"
- r = %x{lsb_release --short --release}.chomp
- if r != "testing/unstable"
- r = 'unknown'
- end
- end
- r
- end
-end