diff options
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/modules/site_nagios/manifests/add_service.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/site_nagios/manifests/server.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/site_postfix/manifests/mx.pp | 4 | 
3 files changed, 4 insertions, 4 deletions
| diff --git a/puppet/modules/site_nagios/manifests/add_service.pp b/puppet/modules/site_nagios/manifests/add_service.pp index 1b67d14e..97c0b30d 100644 --- a/puppet/modules/site_nagios/manifests/add_service.pp +++ b/puppet/modules/site_nagios/manifests/add_service.pp @@ -9,7 +9,7 @@ define site_nagios::add_service (        nagios_service {          "${name}_ssh":            use                 => 'generic-service', -          check_command       => "check_ssh_port!$ssh_port", +          check_command       => "check_ssh_port!${ssh_port}",            service_description => 'SSH',            host_name           => $hostname;          "${name}_cert": diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp index b195c880..37bd77fb 100644 --- a/puppet/modules/site_nagios/manifests/server.pp +++ b/puppet/modules/site_nagios/manifests/server.pp @@ -16,7 +16,7 @@ class site_nagios::server inherits nagios::base {    include nagios::defaults::timeperiods    include nagios::defaults::plugins -  class {'nagios': +  class { 'nagios':      # don't manage apache class from nagios, cause we already include      # it in site_apache::common      httpd              => 'absent', diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp index bdfee665..81f10b77 100644 --- a/puppet/modules/site_postfix/manifests/mx.pp +++ b/puppet/modules/site_postfix/manifests/mx.pp @@ -1,12 +1,12 @@  class site_postfix::mx { -  $domain_hash         = hiera ('domain') +  $domain_hash         = hiera('domain')    $domain              = $domain_hash['full_suffix']    $host_domain         = $domain_hash['full']    $cert_name           = hiera('name')    $mynetworks          = join(hiera('mynetworks'), ' ') -  $root_mail_recipient = hiera ('contacts') +  $root_mail_recipient = hiera('contacts')    $postfix_smtp_listen = 'all'    include site_config::x509::cert | 
