diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-18 13:29:51 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-18 13:29:51 -0200 |
| commit | 8a95d3837ff38ade926e036fcb8d9851e14242aa (patch) | |
| tree | dfe1f48318e9d8569747ecd97ba8ce068c9c0928 | |
| parent | e02a131e4679403c45c852e25cb7128fef30e080 (diff) | |
| download | puppet-nodo-8a95d3837ff38ade926e036fcb8d9851e14242aa.tar.gz puppet-nodo-8a95d3837ff38ade926e036fcb8d9851e14242aa.tar.bz2 | |
Upgrading ssh module
| -rw-r--r-- | manifests/kvm.pp | 10 | ||||
| -rw-r--r-- | manifests/physical.pp | 10 | ||||
| -rw-r--r-- | manifests/plug.pp | 10 | ||||
| -rw-r--r-- | manifests/vserver.pp | 9 |
4 files changed, 36 insertions, 3 deletions
diff --git a/manifests/kvm.pp b/manifests/kvm.pp index 2687a24..2010cf9 100644 --- a/manifests/kvm.pp +++ b/manifests/kvm.pp @@ -50,7 +50,15 @@ class nodo::kvm inherits nodo { case $sshd_listen_address { '': { $sshd_listen_address = [ "$ipaddress" ] } } - include sshd + + class { 'sshd': + listen_address => $sshd_listen_address, + password_authentication => $ssh_password_authentication, + shared_ip => $ssh_shared_ip, + tcp_forwarding => $ssh_tcp_forwarding, + hardened_ssl => $ssh_hardened_ssl, + print_motd => $ssh_print_motd, + } backupninja::sys { "sys": ensure => present, diff --git a/manifests/physical.pp b/manifests/physical.pp index 1c959be..03e8c7c 100644 --- a/manifests/physical.pp +++ b/manifests/physical.pp @@ -51,7 +51,15 @@ class nodo::physical inherits nodo { case $sshd_listen_address { '': { $sshd_listen_address = [ "$ipaddress", '127.0.0.1' ] } } - include sshd + + class { 'sshd': + listen_address => $sshd_listen_address, + password_authentication => $ssh_password_authentication, + shared_ip => $ssh_shared_ip, + tcp_forwarding => $ssh_tcp_forwarding, + hardened_ssl => $ssh_hardened_ssl, + print_motd => $ssh_print_motd, + } backupninja::sys { "sys": ensure => present, diff --git a/manifests/plug.pp b/manifests/plug.pp index 99bde89..37c69c5 100644 --- a/manifests/plug.pp +++ b/manifests/plug.pp @@ -1,5 +1,4 @@ class nodo::plug inherits nodo { - include sshd include ntpdate include syslog-ng include utils::plug @@ -8,6 +7,15 @@ class nodo::plug inherits nodo { include resolver include monkeysphere_nodo + class { 'sshd': + listen_address => $sshd_listen_address, + password_authentication => $ssh_password_authentication, + shared_ip => $ssh_shared_ip, + tcp_forwarding => $ssh_tcp_forwarding, + hardened_ssl => $ssh_hardened_ssl, + print_motd => $ssh_print_motd, + } + backupninja::sys { "sys": ensure => present, } diff --git a/manifests/vserver.pp b/manifests/vserver.pp index de2b2ef..3974602 100644 --- a/manifests/vserver.pp +++ b/manifests/vserver.pp @@ -3,6 +3,15 @@ class nodo::vserver inherits nodo { include timezone include syslog-ng::vserver + class { 'sshd': + listen_address => $sshd_listen_address, + password_authentication => $ssh_password_authentication, + shared_ip => $ssh_shared_ip, + tcp_forwarding => $ssh_tcp_forwarding, + hardened_ssl => $ssh_hardened_ssl, + print_motd => $ssh_print_motd, + } + backupninja::sys { "sys": ensure => present, partitions => false, |