create salsa database with puppet

diff --git a/modules/salsa/manifests/database.pp b/modules/salsa/manifests/database.pp
index de6d2db..0d22449 100644 (file)
--- a/modules/salsa/manifests/database.pp
+++ b/modules/salsa/manifests/database.pp
@@ -1,21 +1,17 @@
 #
 class salsa::database inherits salsa {
-# XXX does not work just yet.
+       include postgresql::server
+       ensure_packages ( "postgresql-contrib-9.6", { ensure => 'installed' })
 
-#      include postgresql::server
-#
-#      postgresql::server::db { $salsa::db_name:
-#              user     => $salsa::db_role,
-#              password => postgresql_password($salsa::db_role, $salsa::db_password),
-#      }
-#
-#      postgresql::server::extension { 'pg_trgm':
-#              database => $salsa::db_name,
-#      }
+       postgresql::server::db { $salsa::db_name:
+               user     => $salsa::db_role,
+               password => postgresql_password($salsa::db_role, $salsa::db_password),
+       }
 
-# so do things by hand for now
-       ensure_packages ( "postgresql", { ensure => 'installed' })
-       # create role, create db owned by role, add extension
+       postgresql::server::extension { 'pg_trgm':
+               database => $salsa::db_name,
+               require => Package['postgresql-contrib-9.6'],
+       }
 
        # XXX set up backups
        file { "/var/lib/postgresql/9.6/main/.nobackup":