ordering fixups

[dsa-puppet.git] / modules / ssh / manifests / init.pp

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index 452ce5dfbaaa24e91e047650d03b00e9dc4aceee..0824f0f892a6563f16897cb06cc7c4b72829a382 100644 (file)
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -1,50 +1,39 @@
 class ssh {
-       package {
-                openssh-client: ensure => installed;
-                openssh-server: ensure => installed;
-        }
-
-        case $hostname {
-                bartok, beethoven: {
-                    $keyinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber")
-                }
-        }
 
+       package { [ 'openssh-client', 'openssh-server']:
+               ensure => installed
+       }
 
-       file { "/etc/ssh/ssh_config":
-               source  => [ "puppet:///ssh/ssh_config" ],
-               require => Package["openssh-client"]
-                ;
-              "/etc/ssh/sshd_config":
-               content => template("ssh/sshd_config.erb"),
-               require => Package["openssh-server"],
-                notify  => Exec["ssh restart"]
-                ;
-              "/etc/ssh/userkeys":
-               ensure  => directory,
-               owner   => root,
-               group   => root,
-               mode    => 755,
-                ;
-              "/etc/ssh/userkeys/root":
-                content => template("ssh/authorized_keys.erb"),
-                mode    => 444,
-                require => Package["openssh-server"]
-                ;
+       service { 'ssh':
+               ensure  => running,
+               require => Package['openssh-server']
        }
 
-        exec { "ssh restart":
-            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-            refreshonly => true,
-        }
+       @ferm::rule { 'dsa-ssh':
+               description => 'Allow SSH from DSA',
+               rule        => '&SERVICE_RANGE(tcp, ssh, $SSH_SOURCES)'
+       }
+       @ferm::rule { 'dsa-ssh-v6':
+               description => 'Allow SSH from DSA',
+               domain      => 'ip6',
+               rule        => '&SERVICE_RANGE(tcp, ssh, $SSH_V6_SOURCES)'
+       }
 
-        ferm::rule { "dsa-ssh":
-                description     => "Allow SSH from DSA",
-                rule            => "proto tcp mod state state (NEW) dport (ssh) @subchain 'ssh' { saddr (\$SSH_SOURCES) ACCEPT; }"
-        }
-        ferm::rule { "dsa-ssh-v6":
-                description     => "Allow SSH from DSA",
-                domain          => "ip6",
-                rule            => "proto tcp mod state state (NEW) dport (ssh) @subchain 'ssh' { saddr (\$SSH_V6_SOURCES) ACCEPT; }"
-        }
+       file { '/etc/ssh/ssh_config':
+               content => template('ssh/ssh_config.erb'),
+               require => Package['openssh-client']
+       }
+       file { '/etc/ssh/sshd_config':
+               content => template('ssh/sshd_config.erb'),
+               require => Package['openssh-server'],
+               notify  => Service['ssh']
+       }
+       file { '/etc/ssh/userkeys':
+               ensure  => directory,
+               mode    => '0755',
+               require => Package['openssh-server']
+       }
+       file { '/etc/ssh/userkeys/root':
+               content => template('ssh/authorized_keys.erb'),
+       }
 }