From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 1 Sep 2017 09:14:56 +0000 (+0000)
Subject: salsa: Make sure we use pg 9.6, and listen on *
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c1593d736d35ce4ca5cdc746bfa457652f2afe9d;p=mirror%2Fdsa-puppet.git

salsa: Make sure we use pg 9.6, and listen on *
---

diff --git a/modules/salsa/manifests/database.pp b/modules/salsa/manifests/database.pp
index 0d22449dc..7323560d6 100644
--- a/modules/salsa/manifests/database.pp
+++ b/modules/salsa/manifests/database.pp
@@ -1,7 +1,12 @@
 #
 class salsa::database inherits salsa {
-	include postgresql::server
-	ensure_packages ( "postgresql-contrib-9.6", { ensure => 'installed' })
+	class { 'postgresql::globals':
+		version => '9.6',
+	}
+	class { 'postgresql::server':
+		listen_addresses => '*',
+	}
+	class { 'postgresql::server::contrib': }
 
 	postgresql::server::db { $salsa::db_name:
 		user     => $salsa::db_role,
@@ -10,7 +15,7 @@ class salsa::database inherits salsa {
 
 	postgresql::server::extension { 'pg_trgm':
 		database => $salsa::db_name,
-		require => Package['postgresql-contrib-9.6'],
+		require => Class['postgresql::server::contrib'],
 	}
 
 	# XXX set up backups