aboutsummaryrefslogtreecommitdiff
path: root/manifests/base.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2014-11-01 10:30:37 -0400
committerMicah Anderson <micah@riseup.net>2014-11-01 10:30:37 -0400
commit4652fbcae0aadcded5d390e71882aec1b1b738ba (patch)
tree17246b7a526c3927c8262dfb88d58abb37aa78c4 /manifests/base.pp
parent37bd36fe06c0fafb353a01672d29cf4bffdc9e4a (diff)
parent1f6f5689309ff1d7b57cdc3306de59d1de36af39 (diff)
downloadpuppet-sshd-4652fbcae0aadcded5d390e71882aec1b1b738ba.tar.gz
puppet-sshd-4652fbcae0aadcded5d390e71882aec1b1b738ba.tar.bz2
Merge remote-tracking branch 'immerda/master'
Diffstat (limited to 'manifests/base.pp')
-rw-r--r--manifests/base.pp9
1 files changed, 6 insertions, 3 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index 813745c..6dddedf 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -3,9 +3,12 @@
# throught the sshd class itself.
class sshd::base {
- $sshd_config_content = $::lsbdistcodename ? {
- '' => template("sshd/sshd_config/${::operatingsystem}.erb"),
- default => template ("sshd/sshd_config/${::operatingsystem}_${::lsbdistcodename}.erb"),
+ $sshd_config_content = $::operatingsystem ? {
+ 'CentOS' => template("sshd/sshd_config/${::operatingsystem}_${::operatingsystemmajrelease}.erb"),
+ default => $::lsbdistcodename ? {
+ '' => template("sshd/sshd_config/${::operatingsystem}.erb"),
+ default => template("sshd/sshd_config/${::operatingsystem}_${::lsbdistcodename}.erb")
+ }
}
file { 'sshd_config':