Create /srv/static.debian.org on static mirrors and masters (not on sources)

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

diff --git a/modules/salsa/manifests/init.pp b/modules/salsa/manifests/init.pp
index 2f741fb..dd4de62 100644 (file)
--- a/modules/salsa/manifests/init.pp
+++ b/modules/salsa/manifests/init.pp
@@ -7,6 +7,7 @@ class salsa inherits salsa::params {
        class { '::salsa::redis': } ->
        class { '::salsa::packages': } ->
        class { '::salsa::database': } ->
+       class { '::salsa::web': } ->
        anchor { 'salsa::end': }
 
        # userdir-ldap users get their home in /home
@@ -46,14 +47,16 @@ class salsa inherits salsa::params {
                content  => @("EOF"),
                                ---
                                # This file was put in place by puppet, but it won't overwrite it.
-                               # Please fill in from dsa-passwords/service-salsa
+                               # Please fill in from dsa-passwords/services-salsa
                                # mastersecret: "swordfish"
                                | EOF
                replace => false,
        }
-
-       ssl::service { $servicename:
-               # notify  => Exec['service apache2 reload'],
-               key => true,
+       file { "/var/lib/systemd/linger/git":
+               ensure => present,
+       }
+       file { "/etc/ssh/userkeys/git":
+               ensure => link,
+               target => "${salsa::home}/.ssh/authorized_keys",
        }
 }