More users for salsa (RT#7316)

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

diff --git a/modules/salsa/manifests/init.pp b/modules/salsa/manifests/init.pp
index 94bfdf2..73821cc 100644 (file)
--- a/modules/salsa/manifests/init.pp
+++ b/modules/salsa/manifests/init.pp
@@ -21,6 +21,47 @@ class salsa inherits salsa::params {
                owner  => $salsa::user,
                group  => $salsa::group,
        }
+       file { "/home/${salsa::registry_user}":
+               ensure => link,
+               target => $salsa::registry_user_home,
+       }
+       file { $salsa::registry_user_home:
+               ensure => directory,
+               mode   => '0755',
+               owner  => $salsa::registry_user,
+               group  => $salsa::registry_user,
+       }
+       file { "/home/${salsa::signup_user}":
+               ensure => link,
+               target => $salsa::signup_user_home,
+       }
+       file { $salsa::signup_user_home:
+               ensure => directory,
+               mode   => '0755',
+               owner  => $salsa::signup_user,
+               group  => $salsa::signup_user,
+       }
+       file { "/home/${salsa::webhook_user}":
+               ensure => link,
+               target => $salsa::webhook_user_home,
+       }
+       file { $salsa::webhook_user_home:
+               ensure => directory,
+               mode   => '0755',
+               owner  => $salsa::webhook_user,
+               group  => $salsa::webhook_user,
+       }
+       file { "/home/${salsa::pages_user}":
+               ensure => link,
+               target => $salsa::pages_user_home,
+       }
+       file { $salsa::pages_user_home:
+               ensure => directory,
+               mode   => '0755',
+               owner  => $salsa::pages_user,
+               group  => $salsa::pages_user,
+       }
+
 
        file { "${salsa::home}/.credentials.yaml":
                mode => '0400',
@@ -52,20 +93,37 @@ class salsa inherits salsa::params {
                                | EOF
                replace => false,
        }
-       file { "/var/lib/systemd/linger/git":
+       file { "/var/lib/systemd/linger/${salsa::user}":
+               ensure => present,
+       }
+       file { "/var/lib/systemd/linger/${salsa::registry_user}":
                ensure => present,
        }
-       file { "/etc/ssh/userkeys/git":
+       file { "/var/lib/systemd/linger/${salsa::signup_user}":
+               ensure => present,
+       }
+       file { "/var/lib/systemd/linger/${salsa::webhook_user}":
+               ensure => present,
+       }
+       file { "/var/lib/systemd/linger/${salsa::pages_user}":
+               ensure => present,
+       }
+       file { "/etc/ssh/userkeys/${salsa::user}":
                ensure => link,
                target => "${salsa::home}/.ssh/authorized_keys",
        }
        # pages
-       file { "/etc/network/interfaces.d/pages-debian-net.conf":
+       file { "/etc/network/interfaces.d/pages.debian.net.conf":
                content  => @("EOF"),
                                iface eth0 inet static
                                    address 209.87.16.45/24
                                iface eth0 inet6 static
                                    address 2607:f8f0:614:1::1274:45/64
+                                   preferred-lifetime 0
                                | EOF
+               notify => Exec['service networking reload'],
+       }
+       exec { 'service networking reload':
+               refreshonly => true,
        }
 }