snapshot_shell -> hiera role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 15ff253..a7c8420 100644 (file)
--- 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 (file)
index 0000000..d1e282a
--- /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 01065f0..e26986d 100644 (file)
--- 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 de4a2aa..6dc54cb 100644 (file)
--- 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',
+  }
 }