fix filename

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

diff --git a/modules/salsa/manifests/init.pp b/modules/salsa/manifests/init.pp
index 95eb0e1..0c2d83e 100644 (file)
--- a/modules/salsa/manifests/init.pp
+++ b/modules/salsa/manifests/init.pp
@@ -1,15 +1,12 @@
 #
-class salsa (
-       $user = $salsa::params::user,
-       $group = $salsa::params::group,
-       $home = $salsa::params::home,
-) inherits salsa::params {
+class salsa inherits salsa::params {
 
        # anchor things in correct order
        anchor { 'salsa::begin': } ->
        class { '::salsa::mail': } ->
        class { '::salsa::redis': } ->
        class { '::salsa::packages': } ->
+       class { '::salsa::database': } ->
        anchor { 'salsa::end': }
 
        # userdir-ldap users get their home in /home
@@ -23,4 +20,40 @@ class salsa (
                owner  => $salsa::user,
                group  => $salsa::group,
        }
+
+       file { "${salsa::home}/.credentials.yaml":
+               mode => '0400',
+               owner  => $salsa::user,
+               group  => $salsa::group,
+               content  => @("EOF"),
+                               ---
+                               # This file is maintained by puppet.
+                               # base secret that gitlab encrypts the DB with
+                               secret: "${salsa::secret}"
+                               database:
+                                 name: "${salsa::db_name}"
+                                 role: "${salsa::db_role}"
+                                 password: "${salsa::db_password}"
+                               mail:
+                                 username: "${salsa::mail_username}"
+                                 password: "${salsa::mail_password}"
+                               | EOF
+       }
+       file { "${salsa::home}/.credentials-manual.yaml":
+               mode => '0400',
+               owner  => $salsa::user,
+               group  => $salsa::group,
+               content  => @("EOF"),
+                               ---
+                               # This file was put in place by puppet, but it won't overwrite it.
+                               # Please fill in from dsa-passwords/services-salsa
+                               # mastersecret: "swordfish"
+                               | EOF
+               replace => false,
+       }
+
+       ssl::service { $servicename:
+               # notify  => Exec['service apache2 reload'],
+               key => true,
+       }
 }