X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsalsa%2Fmanifests%2Finit.pp;fp=modules%2Fsalsa%2Fmanifests%2Finit.pp;h=038986b6edb9ac3b6f4b917f1ed7a3a295c5ad78;hb=94bc127ef10b9d0fdb7484c3839e3dc7a1bc6d06;hp=3e798d029cda5563a49bf569bd56f75b396d6ebb;hpb=95efb9b2fbd478ed0f9ec8d2c28b9508c9006fa9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/salsa/manifests/init.pp b/modules/salsa/manifests/init.pp
index 3e798d029..038986b6e 100644
--- a/modules/salsa/manifests/init.pp
+++ b/modules/salsa/manifests/init.pp
@@ -1,13 +1,5 @@
 #
-class salsa (
-	$user = $salsa::params::user,
-	$group = $salsa::params::group,
-	$home = $salsa::params::home,
-
-	$db_name = $salsa::params::db_name,
-	$db_role = $salsa::params::db_role,
-	$db_password = $salsa::params::db_password,
-) inherits salsa::params {
+class salsa inherits salsa::params {
 
 	# anchor things in correct order
 	anchor { 'salsa::begin': } ->
@@ -39,6 +31,9 @@ class salsa (
 				  name: "${salsa::db_name}"
 				  role: "${salsa::db_role}"
 				  password: "${salsa::db_password}"
+				mail:
+				  username: "${salsa::mail_username}"
+				  password: "${salsa::mail_password}"
 				| EOF
 	}
 }