postgres-make-base-backups: re-order logic for consistency

[mirror/dsa-puppet.git] / modules / salsa / manifests / params.pp

diff --git a/modules/salsa/manifests/params.pp b/modules/salsa/manifests/params.pp
index e647cc2..05e287d 100644 (file)
--- a/modules/salsa/manifests/params.pp
+++ b/modules/salsa/manifests/params.pp
@@ -1,10 +1,19 @@
 #
 class salsa::params {
+       $servicename = "salsa.debian.org"
+
        $user = "git"
        $group = "git"
-       $home = "/srv/salsa.debian.org"
+       $home = "/srv/${servicename}"
+       $webhook_user = "salsa-webhook"
+       $webhook_user_home = "${home}/home-webhook"
 
        $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")
 }