X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsalsa%2Fmanifests%2Finit.pp;h=02b89a07b0a86ed5cfb41cfdb246b78148cb0186;hb=236efe8e28f32419ddc5b4445780bd17775adaf3;hp=94bfdf2250ad2fa3b641656a6c752cb5e8c02856;hpb=f67fef9c28d523a9f646da3f4a06f951c7e9fa5d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/salsa/manifests/init.pp b/modules/salsa/manifests/init.pp
index 94bfdf225..02b89a07b 100644
--- 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,38 @@ 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 { "/etc/ssh/userkeys/git":
+	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":
-		content  => @("EOF"),
-				iface eth0 inet static
-				    address 209.87.16.45/24
+	file { "/etc/network/interfaces.d/pages.debian.net.conf":
+		content  => @(EOF),
 				iface eth0 inet6 static
 				    address 2607:f8f0:614:1::1274:45/64
+				    preferred-lifetime 0
+				    pre-up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/accept_dad
+				iface eth0 inet static
+				    address 209.87.16.45/24
 				| EOF
+		notify => Exec['service networking reload'],
+	}
+	exec { 'service networking reload':
+		refreshonly => true,
 	}
 }