move all files to explicit new-style module/ paths

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

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index 75fb47597466e4c181b174559659154067eb0d98..271c8bdff6155c00a448f453ca4dbae244e52129 100644 (file)
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -5,12 +5,42 @@ class ssh {
         }
 
        file { "/etc/ssh/ssh_config":
-               source  => [ "puppet:///ssh/ssh_config" ],
+               source  => [ "puppet:///modules/ssh/ssh_config" ],
                require => Package["openssh-client"]
                 ;
               "/etc/ssh/sshd_config":
                content => template("ssh/sshd_config.erb"),
-               require => Package["openssh-server"]
+               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"]
                 ;
        }
+
+        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)"
+        }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: