From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 11 Mar 2019 08:56:03 +0000 (+0100)
Subject: Add lw08 to the snapshot_shell role and give ftp-master some infra there
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=3443e44bc5ddeb5191237f3c4111ee7e4acbc8de;p=mirror%2Fdsa-puppet.git

Add lw08 to the snapshot_shell role and give ftp-master some infra there
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f49384f73..4cba84ef2 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -376,5 +376,7 @@ roles:
   snapshot_web:
     - lw07.debian.org
     - sallinen.debian.org
+  snapshot_shell:
+    - lw08.debian.org
   anonscm:
     - cgi-grnet-01.debian.org
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 3aaccfa01..22f9af6e1 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -282,6 +282,10 @@ class roles {
 		include roles::snapshot_web
 	}
 
+	if has_role('snapshot_shell') {
+		include roles::snapshot_shell
+	}
+
 	if has_role('veyepar.debian.org') {
 		ssl::service { 'veyepar.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
diff --git a/modules/roles/manifests/snapshot_shell.pp b/modules/roles/manifests/snapshot_shell.pp
new file mode 100644
index 000000000..23a3bcb0d
--- /dev/null
+++ b/modules/roles/manifests/snapshot_shell.pp
@@ -0,0 +1,24 @@
+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',
+	}
+}