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 23a3bcb..de4a2aa 100644 (file)
--- 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',
+       }
 }