Merge remote-tracking branch 'elijah/feature/known_hosts' into 0.6

Conflicts:
	provider_base/services/monitor.json

1 files changed, 18 insertions, 0 deletions

diff --git a/puppet/modules/site_sshd/manifests/init.pp b/puppet/modules/site_sshd/manifests/init.pp
index 90dd2d0e..2bcde603 100644
--- a/puppet/modules/site_sshd/manifests/init.pp
+++ b/puppet/modules/site_sshd/manifests/init.pp
@@ -1,5 +1,6 @@
 class site_sshd {
   $ssh = hiera_hash('ssh')
+  $hosts = hiera_hash('hosts')
 
   ##
   ## SETUP AUTHORIZED KEYS
@@ -12,6 +13,23 @@ class site_sshd {
   }
 
   ##
+  ## SETUP KNOWN HOSTS and SSH_CONFIG
+  ##
+
+  file {
+    '/etc/ssh/ssh_known_hosts':
+      owner   => root,
+      group   => root,
+      mode    => '0644',
+      content => template('site_sshd/ssh_known_hosts.erb');
+    '/etc/ssh/ssh_config':
+      owner => root,
+      group => root,
+      mode => '0644',
+      content => template('site_sshd/ssh_config.erb');
+  }
+
+  ##
   ## OPTIONAL MOSH SUPPORT
   ##