aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-01-30 21:34:26 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-01-30 21:34:26 -0200
commit466c1c01ab3ebc85e864eaaa7c3a2b68fc2354fa (patch)
tree5792d057091bd0123605c8f2b715ee887b50f4c2
parentee6dbd2f84c7f4b0e030f64c0209bfe8602cf0c1 (diff)
downloadpuppet-nodo-466c1c01ab3ebc85e864eaaa7c3a2b68fc2354fa.tar.gz
puppet-nodo-466c1c01ab3ebc85e864eaaa7c3a2b68fc2354fa.tar.bz2
Using $sshd_shared_ip
-rw-r--r--manifests/init.pp7
1 files changed, 4 insertions, 3 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index c8ac0b0..9c39450 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -46,6 +46,10 @@ class nodo {
$apt_update_method = 'cron'
include apt
+ # Default SSH configuration
+ $sshd_password_authentication = "yes"
+ $sshd_shared_ip = "yes"
+
file { "/etc/hostname":
owner => "root",
group => "root",
@@ -105,7 +109,6 @@ class nodo::server inherits nodo {
# can live together in the same physical host.
#
$sshd_listen_address = [ "$ipaddress" ]
- $sshd_password_authentication = "yes"
include sshd
# Munin
@@ -136,8 +139,6 @@ class nodo::server inherits nodo {
}
class nodo::vserver inherits nodo {
- $sshd_password_authentication = "yes"
- $sshd_internal_ip = "yes"
include sshd
include timezone
include syslog-ng::vserver