From 36bafb5f949db870d4cd4c25acab30c75abd3254 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 31 Aug 2017 21:46:31 +0000
Subject: [PATCH] create salsa database with puppet

---
 modules/salsa/manifests/database.pp | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/modules/salsa/manifests/database.pp b/modules/salsa/manifests/database.pp
index de6d2db7f..0d22449dc 100644
--- 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":
-- 
2.20.1