From 9c2c9e0a88142537050bf99c40dc64696adcf72d Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 16 Sep 2012 16:20:19 +0100 Subject: [PATCH] Simplify postgres fact Signed-off-by: Stephen Gran --- manifests/site.pp | 2 +- modules/debian-org/lib/facter/software.rb | 39 ++++++----------------- 2 files changed, 10 insertions(+), 31 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index e56ca7d11..46becc707 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -110,7 +110,7 @@ node default { include debian-org::radvd } - if ($::postgres84 or $::postgres90) { + if ($::postgres) { include postgres } diff --git a/modules/debian-org/lib/facter/software.rb b/modules/debian-org/lib/facter/software.rb index 533c77933..4404d6fba 100644 --- a/modules/debian-org/lib/facter/software.rb +++ b/modules/debian-org/lib/facter/software.rb @@ -34,36 +34,15 @@ Facter.add("postfix") do end end end -Facter.add("postgres81") do - setcode do - if FileTest.exist?("/usr/lib/postgresql/8.1/bin/postgres") - true - else - '' - end - end -end -Facter.add("postgres83") do - setcode do - if FileTest.exist?("/usr/lib/postgresql/8.3/bin/postgres") - true - else - '' - end - end -end -Facter.add("postgres84") do - setcode do - if FileTest.exist?("/usr/lib/postgresql/8.4/bin/postgres") - true - else - '' - end - end -end -Facter.add("postgres90") do - setcode do - if FileTest.exist?("/usr/lib/postgresql/9.0/bin/postgres") +Facter.add("postgres") do + setcode do + pg = (FileTest.exist?("/usr/lib/postgresql/8.1/bin/postgres") or + FileTest.exist?("/usr/lib/postgresql/8.3/bin/postgres") or + FileTest.exist?("/usr/lib/postgresql/8.4/bin/postgres") or + FileTest.exist?("/usr/lib/postgresql/9.0/bin/postgres") or + FileTest.exist?("/usr/lib/postgresql/9.1/bin/postgres") or + FileTest.exist?("/usr/lib/postgresql/9.2/bin/postgres")) + if pg true else '' -- 2.20.1