added new var to template

git-svn-id: https://svn/ipuppet/trunk/modules/sshd@831 d66ca3ae-40d7-4aa7-90d4-87d79ca94279

diff --git a/manifests/init.pp b/manifests/init.pp
index 71f612507f8b15fd3066a65bb45260ef18fa7b73..1e0f468126dcb757c7330af318755a0e8973c90b 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -52,7 +52,7 @@ define sshd::sshd_config(
                default => $source,
        }
 
-    $real_allowed_users = $sshd_allowed_users ? {
+    $real_sshd_allowed_users = $sshd_allowed_users ? {
         ''  => 'root',
         default => $sshd_allowed_users,
     }

diff --git a/templates/sshd_config/CentOS_normal.erb b/templates/sshd_config/CentOS_normal.erb
index 6544cbd97e2f34e8f9ccc6350a721b43d10255d8..739d43b5d16b738743032687680e6d63cd021ef4 100644 (file)
--- a/templates/sshd_config/CentOS_normal.erb
+++ b/templates/sshd_config/CentOS_normal.erb
@@ -115,4 +115,4 @@ X11Forwarding no
 
 # override default of no subsystems
 Subsystem      sftp    /usr/libexec/openssh/sftp-server
-AllowUsers <%= allowed_users %>
+AllowUsers <%= real_sshd_allowed_users %>

diff --git a/templates/sshd_config/Debian_normal.erb b/templates/sshd_config/Debian_normal.erb
index bde3a9658bd4f63c81ef31dd55b24f431af4f627..746cc0b18d37494c1b90c58fc0d57a3b13df3af6 100644 (file)
--- a/templates/sshd_config/Debian_normal.erb
+++ b/templates/sshd_config/Debian_normal.erb
@@ -84,4 +84,4 @@ AllowTcpForwarding yes
 
 ChallengeResponseAuthentication no
 
-AllowUsers <%= allowed_users %>
+AllowUsers <%= real_sshd_allowed_users %>

diff --git a/templates/sshd_config/Gentoo_normal.erb b/templates/sshd_config/Gentoo_normal.erb
index bfcfb49213dac7469efa9fa3e8a3015cdce8c5bc..aacd07a211699ecc331848fadaa03da27697050b 100644 (file)
--- a/templates/sshd_config/Gentoo_normal.erb
+++ b/templates/sshd_config/Gentoo_normal.erb
@@ -115,4 +115,4 @@ Subsystem   sftp    /usr/lib/misc/sftp-server
 #      AllowTcpForwarding no
 #      ForceCommand cvs server
 
-AllowUsers <%= allowed_users %>
+AllowUsers <%= real_sshd_allowed_users %>

diff --git a/templates/sshd_config/OpenBSD_normal.erb b/templates/sshd_config/OpenBSD_normal.erb
index 6ce7a12d189660c812c01bc0bad04d79039f86f1..dbf18c8d6d5574a6553e8724f149c9bff78d7eaa 100644 (file)
--- a/templates/sshd_config/OpenBSD_normal.erb
+++ b/templates/sshd_config/OpenBSD_normal.erb
@@ -93,7 +93,7 @@ PasswordAuthentication no
 # override default of no subsystems
 Subsystem      sftp    /usr/libexec/sftp-server
 
-AllowUsers <%= allowed_users %>
+AllowUsers <%= real_sshd_allowed_users %>
 
 # Example of overriding settings on a per-user basis
 #Match User anoncvs