Put lw01,lw02,lw03,lw04,lw09,lw10 into a snapshot_base class and include that also...

[mirror/dsa-puppet.git] / modules / roles / manifests / snapshot_shell.pp

diff --git a/modules/roles/manifests/snapshot_shell.pp b/modules/roles/manifests/snapshot_shell.pp
index 23a3bcb..2015213 100644 (file)
--- a/modules/roles/manifests/snapshot_shell.pp
+++ b/modules/roles/manifests/snapshot_shell.pp
@@ -1,24 +1,27 @@
 class roles::snapshot_shell {
-       # give ftpmaster/the dak user some environment so they can poll the
-       # list of files we have
-       file { '/etc/ssh/userkeys/dak':
-               ensure => present,
-               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',
-       }
-       file { '/srv/ftp-master.debian.org':
-               ensure => directory,
-               owner => 'root',
-               group => 'debadmin',
-               mode => '02775',
-       }
+  include roles::snapshot_base
+
+  # give ftpmaster/the dak user some environment so they can poll the
+  # list of files we have
+  file { '/etc/ssh/userkeys/dak':
+    ensure => present,
+    owner  => dak,
+    mode   => '0644',
+  }
+  file { '/home/dak':
+    ensure => link,
+    target => '/srv/ftp-master.debian.org/home',
+  }
+  file { '/srv/ftp-master.debian.org':
+    ensure => directory,
+    owner  => 'root',
+    group  => 'debadmin',
+    mode   => '2775',
+  }
+  file { '/srv/ftp-master.debian.org/home':
+    ensure => directory,
+    owner  => 'dak',
+    group  => 'debadmin',
+    mode   => '2755',
+  }
 }