moved sshd to templates so they are cpable of having different allowed_users

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

diff --git a/manifests/init.pp b/manifests/init.pp
index fc6547ce4fa1b947bfc21038bb9406bd53a0b579..e10a583f338e3b1e40eb58c698609140b9c11ce9 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -26,10 +26,11 @@ class sshd {
 }
 
 define sshd::sshd_config (
-       $source = ""
+       $source = "",
+       $allowed_users => 'root'
 ){
        $real_source = $source ? {
-               '' => "${operatingsystem}_normal",
+               '' => "${operatingsystem}_normal.erb",
                default => $source,
        }
 
@@ -38,7 +39,7 @@ define sshd::sshd_config (
                 owner => root,
                 group => 0,
                 mode => 600,
-                source => "puppet://$server/sshd/sshd_config/$real_source",
+                source => template("sshd/sshd_config/$real_source"),
                notify => Service[sshd],
         }
 }

diff --git a/files/sshd_config/CentOS_normal b/templates/sshd_config/CentOS_normal.erb
similarity index 99%
rename from files/sshd_config/CentOS_normal
rename to templates/sshd_config/CentOS_normal.erb
index 7b8ebcc4fcdac39f18a78d2bc8af23553a284844..6544cbd97e2f34e8f9ccc6350a721b43d10255d8 100644 (file)
--- a/files/sshd_config/CentOS_normal
+++ 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 root
+AllowUsers <%= allowed_users %>

diff --git a/files/sshd_config/Gentoo_normal b/templates/sshd_config/Gentoo_normal.erb
similarity index 99%
rename from files/sshd_config/Gentoo_normal
rename to templates/sshd_config/Gentoo_normal.erb
index aec8c077aabf0e1c334249c9407160015a2df49a..bfcfb49213dac7469efa9fa3e8a3015cdce8c5bc 100644 (file)
--- a/files/sshd_config/Gentoo_normal
+++ b/templates/sshd_config/Gentoo_normal.erb
@@ -115,4 +115,4 @@ Subsystem   sftp    /usr/lib/misc/sftp-server
 #      AllowTcpForwarding no
 #      ForceCommand cvs server
 
-AllowUsers root
+AllowUsers <%= allowed_users %>