summaryrefslogtreecommitdiff
path: root/puppet/modules/site_sshd
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-09-03 23:08:08 +0200
committervarac <varacanero@zeromail.org>2014-09-03 23:08:08 +0200
commit0df84cf7987c3047ecc0353e8d29c2c38437a5a2 (patch)
treec0db8548571cba8ef8bb5c2a258136c97780acf7 /puppet/modules/site_sshd
parenta54b82ff7cdae2e44bc3c159473ca03e283f0746 (diff)
parentb806d84a2fc292e3fb8a3f5fd1fb029c2cdb629e (diff)
Merge branch 'master' into develop
Conflicts: platform.rb puppet/modules/site_config/manifests/hosts.pp
Diffstat (limited to 'puppet/modules/site_sshd')
-rw-r--r--puppet/modules/site_sshd/manifests/init.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/modules/site_sshd/manifests/init.pp b/puppet/modules/site_sshd/manifests/init.pp
index 400c21ea..9a05b6ed 100644
--- a/puppet/modules/site_sshd/manifests/init.pp
+++ b/puppet/modules/site_sshd/manifests/init.pp
@@ -52,7 +52,7 @@ class site_sshd {
## SSHD SERVER CONFIGURATION
##
class { '::sshd':
- manage_nagios => 'no',
+ manage_nagios => false,
ports => $ssh['port'],
use_pam => 'yes',
hardened_ssl => 'yes',