From 1fd1d896a024a860bef7fa6c3b622df71e4a8017 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 27 Dec 2009 14:23:51 -0200
Subject: Introducing sshd_internal_ip variable

---
 manifests/client/base.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'manifests/client')

diff --git a/manifests/client/base.pp b/manifests/client/base.pp
index 33d9f9e..b1dc99d 100644
--- a/manifests/client/base.pp
+++ b/manifests/client/base.pp
@@ -5,5 +5,8 @@ class sshd::client::base {
   }
 
   # Now collect all server keys
-  Sshkey <<||>>
+  case $sshd_internal_ip {
+    no:  { Sshkey <<||>> }
+    yes: { Sshkey <<| tag == "fqdn" |>> }
+  }
 }
-- 
cgit v1.2.3


From 1a26489a12943d3e14942f82a4290b9a75e7f65c Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 30 Jan 2010 21:32:12 -0200
Subject: Renaming $sshd_internal_ip to $sshd_shared_ip

---
 manifests/base.pp        | 4 ++--
 manifests/client/base.pp | 2 +-
 manifests/init.pp        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'manifests/client')

diff --git a/manifests/base.pp b/manifests/base.pp
index 9aed1ba..848e547 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -19,9 +19,9 @@ class sshd::base {
         key    => $sshrsakey,
         ensure => present,
       }
-      # In case the node has an internal network address,
+      # In case the node has uses a shared network address,
       # we don't define a sshkey resource using an IP address
-      if $sshd_internal_ip == "no" {
+      if $sshd_shared_ip == "no" {
         @@sshkey{"$ipaddress":
           tag    => "ipaddress",
           type   => ssh-rsa,
diff --git a/manifests/client/base.pp b/manifests/client/base.pp
index b1dc99d..7329f55 100644
--- a/manifests/client/base.pp
+++ b/manifests/client/base.pp
@@ -5,7 +5,7 @@ class sshd::client::base {
   }
 
   # Now collect all server keys
-  case $sshd_internal_ip {
+  case $sshd_shared_ip {
     no:  { Sshkey <<||>> }
     yes: { Sshkey <<| tag == "fqdn" |>> }
   }
diff --git a/manifests/init.pp b/manifests/init.pp
index f20c0d2..72f4f4e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -214,8 +214,8 @@ class sshd {
   case $sshd_print_motd {
     '': { $sshd_print_motd = "yes" }
   }
-  case $sshd_internal_ip {
-    '': { $sshd_internal_ip = "no" }
+  case $sshd_shared_ip {
+    '': { $sshd_shared_ip = "no" }
   }
 
   include sshd::client 
-- 
cgit v1.2.3