Merge branch 'master' of github.com:saz/puppet-ssh

xbezdick · Feb 24, 2014 · 10426ab · 10426ab
2 parents c4c344b + cb143b9
commit 10426ab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/manifests/client/config.pp b/manifests/client/config.pp
@@ -1,9 +1,9 @@
-class ssh::client::config {
+class ssh::client::config inherits ssh { 
   file { $ssh::params::ssh_config:
     ensure  => present,
     owner   => 'root',
     group   => 'root',
-    source  => "puppet:///modules/${module_name}/ssh_config",
+    content => template("${module_name}/ssh_config.erb"),
     require => Class['ssh::client::install'],
   }
 

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -1,4 +1,6 @@
-class ssh {
+class ssh (
+  $disable_user_known_hosts = true
+) {
   include ssh::server
   include ssh::client
 }
diff --git a/files/ssh_config → templates/ssh_config.erb b/files/ssh_config → templates/ssh_config.erb
@@ -51,4 +51,6 @@ Host *
     HashKnownHosts yes
     GSSAPIAuthentication yes
     GSSAPIDelegateCredentials no
+    <% if disable_user_known_hosts %>
     UserKnownHostsFile /dev/null
+    <% end %>