From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 17:05:50 +0000 (+0200)
Subject: snapshot_shell -> hiera role
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=36a5952c31ae532799db9755708737cdba386a6b;p=mirror%2Fdsa-puppet.git

snapshot_shell -> hiera role
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 15ff25351..a7c84204d 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -196,8 +196,6 @@ roles:
   snapshot_web:
     - lw07.debian.org
     - sallinen.debian.org
-  snapshot_shell:
-    - lw08.debian.org
 
 classes:
   - base::includes
diff --git a/hieradata/nodes/lw08.debian.org.yaml b/hieradata/nodes/lw08.debian.org.yaml
new file mode 100644
index 000000000..d1e282a78
--- /dev/null
+++ b/hieradata/nodes/lw08.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::snapshot_shell
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 01065f003..e26986d48 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -86,10 +86,6 @@ class roles {
 		include roles::snapshot_web
 	}
 
-	if has_role('snapshot_shell') {
-		include roles::snapshot_shell
-	}
-
 	if has_role('ports_master') {
 		include roles::ports_master
 	}
diff --git a/modules/roles/manifests/snapshot_shell.pp b/modules/roles/manifests/snapshot_shell.pp
index de4a2aad9..6dc54cb5b 100644
--- a/modules/roles/manifests/snapshot_shell.pp
+++ b/modules/roles/manifests/snapshot_shell.pp
@@ -1,25 +1,25 @@
 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',
-	}
+  # 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',
+  }
 }