From 665db30f37838bcebbfdc368f65ed369282c31b8 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Sun, 9 Feb 2014 17:04:58 -0800
Subject: deploy a valid /etc/ssh/ssh_known_hosts for all nodes (requires new
 leap_cli)

---
 puppet/modules/site_sshd/manifests/init.pp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'puppet/modules/site_sshd/manifests/init.pp')

diff --git a/puppet/modules/site_sshd/manifests/init.pp b/puppet/modules/site_sshd/manifests/init.pp
index 90dd2d0e..d2b13822 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
@@ -11,6 +12,14 @@ class site_sshd {
     keys => $authorized_keys
   }
 
+  ##
+  ## SETUP KNOWN HOSTS
+  ##
+
+  class { 'site_sshd::known_hosts':
+    hosts => $hosts
+  }
+
   ##
   ## OPTIONAL MOSH SUPPORT
   ##
-- 
cgit v1.2.3


From 0b3e87cd6916d4ca4404fd2b375d21468d17f343 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 10 Feb 2014 15:43:39 -0800
Subject: turn off StrictHostKeyChecking for vagrant ssh clients

---
 puppet/modules/site_sshd/manifests/init.pp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'puppet/modules/site_sshd/manifests/init.pp')

diff --git a/puppet/modules/site_sshd/manifests/init.pp b/puppet/modules/site_sshd/manifests/init.pp
index d2b13822..2bcde603 100644
--- a/puppet/modules/site_sshd/manifests/init.pp
+++ b/puppet/modules/site_sshd/manifests/init.pp
@@ -13,11 +13,20 @@ class site_sshd {
   }
 
   ##
-  ## SETUP KNOWN HOSTS
+  ## SETUP KNOWN HOSTS and SSH_CONFIG
   ##
 
-  class { 'site_sshd::known_hosts':
-    hosts => $hosts
+  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');
   }
 
   ##
-- 
cgit v1.2.3


From c1d1d9d7cf6fefd1203cc09a66c2e0230b930b5e Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 10 Feb 2014 14:44:01 +0100
Subject: use default value for hiera lookup (#5118)

---
 puppet/modules/site_sshd/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/site_sshd/manifests/init.pp')

diff --git a/puppet/modules/site_sshd/manifests/init.pp b/puppet/modules/site_sshd/manifests/init.pp
index 2bcde603..d9bc1d51 100644
--- a/puppet/modules/site_sshd/manifests/init.pp
+++ b/puppet/modules/site_sshd/manifests/init.pp
@@ -1,6 +1,6 @@
 class site_sshd {
   $ssh = hiera_hash('ssh')
-  $hosts = hiera_hash('hosts')
+  $hosts = hiera('hosts', '')
 
   ##
   ## SETUP AUTHORIZED KEYS
-- 
cgit v1.2.3