X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsalsa%2Fmanifests%2Finit.pp;h=73821cc68e19891505ed9c568266c6bdf5ec7c6f;hb=50f3bee0b3eefc0245a119a38f30409e34d04d5e;hp=dbcaaf6491040380ea0b2e1533c5f71ef0d80500;hpb=c33dfb62ca19f76e961de79af216905b75d98394;p=mirror%2Fdsa-puppet.git

diff --git a/modules/salsa/manifests/init.pp b/modules/salsa/manifests/init.pp
index dbcaaf649..73821cc68 100644
--- 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":
@@ -63,13 +93,22 @@ 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 { "/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-webhook":
+	file { "/var/lib/systemd/linger/${salsa::pages_user}":
 		ensure => present,
 	}
-	file { "/etc/ssh/userkeys/git":
+	file { "/etc/ssh/userkeys/${salsa::user}":
 		ensure => link,
 		target => "${salsa::home}/.ssh/authorized_keys",
 	}