X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fsnapshot_shell.pp;h=4ffc08a3b146daca9053e04a2ebd468823b66ff4;hb=3d1e20d9385fd27268e268d7d022b86ac6c905c5;hp=de4a2aad9e358cd9d3056d70432ad21d8ac3334a;hpb=45051a04bcdc18d3ebafd00d20369d8060d7b97a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/snapshot_shell.pp b/modules/roles/manifests/snapshot_shell.pp
index de4a2aad9..4ffc08a3b 100644
--- a/modules/roles/manifests/snapshot_shell.pp
+++ b/modules/roles/manifests/snapshot_shell.pp
@@ -1,25 +1,28 @@
+# the shell host for users/roles to access the snapshot service
 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 { '/home/dak':
-		ensure => link,
-		target => '/srv/ftp-master.debian.org/home',
-	}
-	file { '/srv/ftp-master.debian.org':
-		ensure => directory,
-		owner => 'root',
-		group => 'debadmin',
-		mode => '02775',
-	}
-	file { '/srv/ftp-master.debian.org/home':
-		ensure => directory,
-		owner => 'dak',
-		group => 'debadmin',
-		mode => '02755',
-	}
+  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',
+  }
 }