From: Stephen Gran <steve@lobefin.net>
Date: Sun, 16 Sep 2012 15:20:19 +0000 (+0100)
Subject: Simplify postgres fact
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=9c2c9e0a88142537050bf99c40dc64696adcf72d;p=mirror%2Fdsa-puppet.git

Simplify postgres fact

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

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
 			''