diff options
| author | Micah Anderson <micah@riseup.net> | 2009-07-07 20:52:40 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2009-07-07 20:52:40 -0400 |
| commit | f44776cbbf1f825e0961c6aedecf67f6652859a6 (patch) | |
| tree | 5a97a355ac6472f1e23a187b5adb730ce93068a1 /manifests | |
| parent | 60eb9319d3d1c4697de349485326a9ab019f5856 (diff) | |
replace the sshd_additional_options variable with two, one called
sshd_head_additional_options and one called sshd_tail_additional_options.
the first puts the value at the beginning of the file, and the second at
the end.
This is necessary due to some option ordering requiring things to be
before others
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 0480fee..b7ae200 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -113,10 +113,17 @@ # Might be interesting for sftponly usage # Default: empty -> no change of the default # -# sshd_additional_options: Set this to any additional sshd_options which aren't listed above. -# As well this option might be usefull to define complexer Match Blocks -# This string is going to be included, like it is defined. So take care! -# Default: empty -> not added. +# sshd_head_additional_options: Set this to any additional sshd_options which aren't listed above. +# Anything set here will be added to the beginning of the sshd_config file. +# This option might be useful to define complicated Match Blocks +# This string is going to be included, like it is defined. So take care! +# Default: empty -> not added. +# +# sshd_tail_additional_options: Set this to any additional sshd_options which aren't listed above. +# Anything set here will be added to the end of the sshd_config file. +# This option might be useful to define complicated Match Blocks +# This string is going to be included, like it is defined. So take care! +# Default: empty -> not added. class sshd { include sshd::client @@ -195,8 +202,12 @@ class sshd::base { case $sshd_sftp_subsystem { '': { $sshd_sftp_subsystem = '' } } - case $sshd_additional_options { - '': { $sshd_additional_options = '' } + case $sshd_head_additional_options { + '': { $sshd_head_additional_options = '' } + } + case $sshd_tail_additional_options { + '': { $sshd_tail_additional_options = '' } + } } file { 'sshd_config': |