Unified Diff: modules/ssh/manifests/init.pp
Issue 5766400081657856:
#760 - Make our ssh configuration used automatically for all servers (Closed)
Patch Set:
Created July 15, 2014, 11:03 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« modules/filtermaster/manifests/init.pp ('K')
|
« modules/filtermaster/manifests/init.pp ('k')
|
modules/ssh/templates/sshd_config.erb » ('j')
|
modules/ssh/templates/sshd_config.erb » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/ssh/manifests/init.pp |
| =================================================================== |
| --- a/modules/ssh/manifests/init.pp |
| +++ b/modules/ssh/manifests/init.pp |
| @@ -1,13 +1,18 @@ |
| -class ssh ($custom_configuration = '') { |
| +class ssh () { |
|
Wladimir Palant
2014/07/15 11:56:47
Nit: parentheses are unnecessary if there are no p
mathias
2014/07/15 12:03:12
Ok.
|
| package {'openssh-server': ensure => present} |
| - file {'/etc/ssh/sshd_config': |
| - ensure => present, |
| + concat {'sshd_config': |
| + path => '/etc/ssh/sshd_config', |
| owner => root, |
| group => root, |
| mode => 0644, |
| + require => Package['openssh-server'] |
| + } |
| + |
| + concat::fragment {'sshd_config_template': |
| + target => 'sshd_config', |
| content => template('ssh/sshd_config.erb'), |
| - require => Package['openssh-server'] |
| + order => '01', |
| } |
| service {'ssh': |
| @@ -15,6 +20,6 @@ |
| enable => true, |
| hasstatus => true, |
| hasrestart => true, |
| - subscribe => File['/etc/ssh/sshd_config'] |
| + subscribe => Concat['sshd_config'] |
| } |
| } |
