From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 11 Mar 2019 08:59:43 +0000 (+0100)
Subject: remove duplicate /etc/ssh/userkeys/dak, add srv/ftp.../home
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=45051a04bcdc18d3ebafd00d20369d8060d7b97a;p=mirror%2Fdsa-puppet.git

remove duplicate /etc/ssh/userkeys/dak, add srv/ftp.../home
---

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',
+	}
 }