X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsalsa%2Fmanifests%2Finit.pp;h=02b89a07b0a86ed5cfb41cfdb246b78148cb0186;hb=178c25f7efba526cf342d1ec047592714355b554;hp=be5d10f107b4373ea752bb99f170b97c02c19980;hpb=411c0eeb7a316e7070ae1785374ebe8cfb509eff;p=mirror%2Fdsa-puppet.git

diff --git a/modules/salsa/manifests/init.pp b/modules/salsa/manifests/init.pp
index be5d10f10..02b89a07b 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,24 +93,34 @@ 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
+		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'],
 	}