X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsalsa%2Fmanifests%2Fparams.pp;h=05e287d39957348c768dc7d3c9e288a7ba0c899f;hb=5bb25a7b7e1cb7e3da6c25628b3c2c76d55e6755;hp=958e5d69827a665000ccfcf5f33e4f94a5580e1e;hpb=94bc127ef10b9d0fdb7484c3839e3dc7a1bc6d06;p=mirror%2Fdsa-puppet.git diff --git a/modules/salsa/manifests/params.pp b/modules/salsa/manifests/params.pp index 958e5d698..05e287d39 100644 --- a/modules/salsa/manifests/params.pp +++ b/modules/salsa/manifests/params.pp @@ -1,13 +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}") - $mail_username = "gitlab" - $mail_password = hkdf('/etc/puppet/secret', "mail-imap-dovecot-${::hostname}-salsa-${mail_username}") + $secret = hkdf('/etc/puppet/secret', "salsa-${::hostname}-base-secret") }