X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsalsa%2Fmanifests%2Fparams.pp;h=191b0b992ce6d88324cb04cdc4f8504854fe0969;hb=04b5e988827426548ea98b4321392704462c0064;hp=e647cc2405388df16ed3e9371cede2759aa34927;hpb=95efb9b2fbd478ed0f9ec8d2c28b9508c9006fa9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/salsa/manifests/params.pp b/modules/salsa/manifests/params.pp
index e647cc240..191b0b992 100644
--- a/modules/salsa/manifests/params.pp
+++ b/modules/salsa/manifests/params.pp
@@ -1,10 +1,17 @@
 #
 class salsa::params {
+	$servicename = "salsa.debian.org"
+
 	$user = "git"
 	$group = "git"
-	$home = "/srv/salsa.debian.org"
+	$home = "/srv/${servicename}"
 
 	$db_name = "salsa"
 	$db_role = "salsa"
-	$db_password = hkdf('/etc/puppet/secret', "postgresql-${::hostname}-salsa-${db_role}")
+	$db_password = hkdf('/etc/puppet/secret', "postgresql-${::hostname}-${servicename}-${db_role}")
+
+	$mail_username = "gitlab@${servicename}"
+	$mail_password = hkdf('/etc/puppet/secret', "mail-imap-dovecot-${::hostname}-${servicename}-${mail_username}")
+
+	$secret = hkdf('/etc/puppet/secret', "salsa-${::hostname}-base-secret")
 }