whitespace/quoting: modules/exim/manifests/* (make lint happy)

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index e60cfb7..833ba26 100644 (file)
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -1,47 +1,47 @@
 class exim::mx inherits exim {
-       include clamav
-       include postgrey
-       include fail2ban::exim
+  include clamav
+  include postgrey
+  include fail2ban::exim
 
-       file { '/etc/exim4/ccTLD.txt':
-               source => 'puppet:///modules/exim/common/ccTLD.txt',
-       }
-       file { '/etc/exim4/surbl_whitelist.txt':
-               source => 'puppet:///modules/exim/common/surbl_whitelist.txt',
-       }
-       file { '/etc/exim4/exim_surbl.pl':
-               source  => 'puppet:///modules/exim/common/exim_surbl.pl',
-               notify  => Service['exim4'],
-       }
+  file { '/etc/exim4/ccTLD.txt':
+    source => 'puppet:///modules/exim/common/ccTLD.txt',
+  }
+  file { '/etc/exim4/surbl_whitelist.txt':
+    source => 'puppet:///modules/exim/common/surbl_whitelist.txt',
+  }
+  file { '/etc/exim4/exim_surbl.pl':
+    source => 'puppet:///modules/exim/common/exim_surbl.pl',
+    notify => Service['exim4'],
+  }
 
-       # MXs used as smarthosts
-       ferm::rule { 'dsa-exim-submission':
-               description => 'Allow SMTP',
-               rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_SOURCES)'
-       }
-       ferm::rule { 'dsa-exim-v6-submission':
-               description => 'Allow SMTP',
-               domain      => 'ip6',
-               rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_V6_SOURCES)',
-       }
-       $autocertdir = hiera('paths.auto_certs_dir')
-       dnsextras::tlsa_record{ "tlsa-submission":
-               zone => 'debian.org',
-               certfile => "${autocertdir}/${::fqdn}.crt",
-               port => 587,
-               hostname => "$::fqdn",
-       }
-       package { 'monitoring-plugins-standard':
-               ensure => installed,
-       }
+  # MXs used as smarthosts
+  ferm::rule { 'dsa-exim-submission':
+    description => 'Allow SMTP',
+    rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_SOURCES)'
+  }
+  ferm::rule { 'dsa-exim-v6-submission':
+    description => 'Allow SMTP',
+    domain      => 'ip6',
+    rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_V6_SOURCES)',
+  }
+  $autocertdir = hiera('paths.auto_certs_dir')
+  dnsextras::tlsa_record{ 'tlsa-submission':
+    zone     => 'debian.org',
+    certfile => "${autocertdir}/${::fqdn}.crt",
+    port     => 587,
+    hostname => $::fqdn,
+  }
+  package { 'monitoring-plugins-standard':
+    ensure => installed,
+  }
 
-       if $exim::is_mailrelay {
-               concat::fragment { 'puppet-crontab--email-virtualdomains':
-                       target => '/etc/cron.d/puppet-crontab',
-                       content  => @(EOF)
-                               @hourly  root if [ ! -d /etc/exim4/email-virtualdomains ]; then cd /etc/exim4 && git clone mail-git:email-virtualdomains ; fi && cd /etc/exim4/email-virtualdomains && git pull --quiet --ff-only
-                               | EOF
-               }
-       }
-       file { '/etc/cron.d/dsa-email-virtualdomains': ensure => absent, }
+  if $exim::is_mailrelay {
+    concat::fragment { 'puppet-crontab--email-virtualdomains':
+      target  => '/etc/cron.d/puppet-crontab',
+      content => @(EOF)
+        @hourly  root if [ ! -d /etc/exim4/email-virtualdomains ]; then cd /etc/exim4 && git clone mail-git:email-virtualdomains ; fi && cd /etc/exim4/email-virtualdomains && git pull --quiet --ff-only
+        | EOF
+    }
+  }
+  file { '/etc/cron.d/dsa-email-virtualdomains': ensure => absent, }
 }

diff --git a/modules/exim/manifests/vdomain.pp b/modules/exim/manifests/vdomain.pp
index de21442..de62334 100644 (file)
--- a/modules/exim/manifests/vdomain.pp
+++ b/modules/exim/manifests/vdomain.pp
@@ -1,35 +1,35 @@
 define exim::vdomain (
-       $alias_file,
-       $user,
-       $group,
-       $maildir="/srv/${name}",
-       $domain=$name,
+  $alias_file,
+  $user,
+  $group,
+  $maildir="/srv/${name}",
+  $domain=$name,
 ) {
-       include exim::vdomain::setup
+  include exim::vdomain::setup
 
-       file { $maildir:
-               ensure => directory,
-               mode   => '0755',
-               owner  => root,
-               group  => root
-       }
+  file { $maildir:
+    ensure => directory,
+    mode   => '0755',
+    owner  => root,
+    group  => root
+  }
 
-       file { "${maildir}/mail":
-               ensure => directory,
-               mode   => '0755',
-               owner  => root,
-               group  => root
-       }
+  file { "${maildir}/mail":
+    ensure => directory,
+    mode   => '0755',
+    owner  => root,
+    group  => root
+  }
 
-       file { "${maildir}/mail/aliases":
-               source => $alias_file,
-               mode   => '0644',
-               owner  => root,
-               group  => root
-       }
+  file { "${maildir}/mail/aliases":
+    source => $alias_file,
+    mode   => '0644',
+    owner  => root,
+    group  => root
+  }
 
-       concat::fragment { "virtualdomain_${domain}":
-               target  => '/etc/exim4/virtualdomains',
-               content => "${domain}: user=${user} group=${group} directory=${maildir}/mail\n",
-       }
+  concat::fragment { "virtualdomain_${domain}":
+    target  => '/etc/exim4/virtualdomains',
+    content => "${domain}: user=${user} group=${group} directory=${maildir}/mail\n",
+  }
 }

diff --git a/modules/exim/manifests/vdomain/setup.pp b/modules/exim/manifests/vdomain/setup.pp
index 1433887..ffb2ad7 100644 (file)
--- a/modules/exim/manifests/vdomain/setup.pp
+++ b/modules/exim/manifests/vdomain/setup.pp
@@ -1,15 +1,14 @@
 class exim::vdomain::setup {
+  concat { '/etc/exim4/virtualdomains':
+    owner   => root,
+    group   => root,
+    mode    => '0644',
+    require => Package['exim4-daemon-heavy']
+  }
 
-       concat { '/etc/exim4/virtualdomains':
-               owner   => root,
-               group   => root,
-               mode    => '0644',
-               require => Package['exim4-daemon-heavy']
-       }
-
-       concat::fragment { 'virtualdomains_header':
-               target => '/etc/exim4/virtualdomains',
-               content => template('exim/virtualdomains.header.erb'),
-               order  => '00',
-       }
+  concat::fragment { 'virtualdomains_header':
+    target  => '/etc/exim4/virtualdomains',
+    content => template('exim/virtualdomains.header.erb'),
+    order   => '00',
+  }
 }