X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsnapshot_shell.pp;h=de4a2aad9e358cd9d3056d70432ad21d8ac3334a;hb=236efe8e28f32419ddc5b4445780bd17775adaf3;hp=23a3bcb0d84a3dbb4c9924880a115defa9a76df7;hpb=3443e44bc5ddeb5191237f3c4111ee7e4acbc8de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/snapshot_shell.pp b/modules/roles/manifests/snapshot_shell.pp
index 23a3bcb0d..de4a2aad9 100644
--- a/modules/roles/manifests/snapshot_shell.pp
+++ b/modules/roles/manifests/snapshot_shell.pp
@@ -6,14 +6,9 @@ class roles::snapshot_shell {
 		owner => dak,
 		mode => '0644',
 	}
-	file { '/etc/ssh/userkeys/dak':
-		ensure => present,
-		owner => 'dak',
-		mode => '0644',
-	}
 	file { '/home/dak':
 		ensure => link,
-		target => '/srv/ftp-master.debian.org',
+		target => '/srv/ftp-master.debian.org/home',
 	}
 	file { '/srv/ftp-master.debian.org':
 		ensure => directory,
@@ -21,4 +16,10 @@ class roles::snapshot_shell {
 		group => 'debadmin',
 		mode => '02775',
 	}
+	file { '/srv/ftp-master.debian.org/home':
+		ensure => directory,
+		owner => 'dak',
+		group => 'debadmin',
+		mode => '02755',
+	}
 }