aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-01-30 21:32:12 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-01-30 21:32:12 -0200
commit1a26489a12943d3e14942f82a4290b9a75e7f65c (patch)
tree198732a8e853628523cdfa4019a1ef8fc4a921a6
parent1e932ca9279a83721093f52593aa0af22aa72880 (diff)
downloadpuppet-sshd-1a26489a12943d3e14942f82a4290b9a75e7f65c.tar.gz
puppet-sshd-1a26489a12943d3e14942f82a4290b9a75e7f65c.tar.bz2
Renaming $sshd_internal_ip to $sshd_shared_ip
-rw-r--r--manifests/base.pp4
-rw-r--r--manifests/client/base.pp2
-rw-r--r--manifests/init.pp4
3 files changed, 5 insertions, 5 deletions
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