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 0d22449..7323560 100644 (file)
--- 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