diff options
| author | Micah Anderson <micah@riseup.net> | 2008-09-27 16:42:08 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2008-09-27 16:42:08 -0400 |
| commit | 57eb2df0371c53988244094e07b1b30486529d0d (patch) | |
| tree | 50c56d4b69e95357b0891753cd514cd79c99521d /manifests | |
| parent | 0c7bc1b107f1f2b3e8e6ad045351d55390e1365b (diff) | |
| download | puppet-sshd-57eb2df0371c53988244094e07b1b30486529d0d.tar.gz puppet-sshd-57eb2df0371c53988244094e07b1b30486529d0d.tar.bz2 | |
Change the template naming:
1. remove the _normal suffix, as it is not used
2. add a selector to look for the variable $lsbdistcodename being set and use that in selecting a template
this is useful to create a Debian_Etch.erb and a Debian_Lenny.erb which can have different values. For example
the Debian Etch version of openssh does not have the AllowAgentForwarding option, and if it is included, ssh will
fail to start
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index af948f3..be33d7d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -188,7 +188,10 @@ class sshd::base { owner => root, group => 0, mode => 600, - content => template("sshd/sshd_config/${operatingsystem}_normal.erb"), + content => $lsbdistcodename ? { + '' => template("sshd/sshd_config/${operatingsystem}.erb"), + default => template ("sshd/sshd_config/${operatingsystem}_${lsbdistcodename}.erb"), + } notify => Service[sshd], } # Now add the key, if we've got one |