Merge remote-tracking branch 'origin/master' into staging

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

diff --git a/modules/salsa/manifests/init.pp b/modules/salsa/manifests/init.pp
index a2d2063..73821cc 100644 (file)
--- a/modules/salsa/manifests/init.pp
+++ b/modules/salsa/manifests/init.pp
@@ -21,6 +21,26 @@ 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,
@@ -31,6 +51,16 @@ class salsa inherits salsa::params {
                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":
@@ -66,9 +96,18 @@ class salsa inherits salsa::params {
        file { "/var/lib/systemd/linger/${salsa::user}":
                ensure => present,
        }
+       file { "/var/lib/systemd/linger/${salsa::registry_user}":
+               ensure => present,
+       }
+       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",