From 8a39fe6efb7533cf5b31ca7af74a057610c2f4f1 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 25 Aug 2011 15:49:07 -0400 Subject: formatting standardization --- manifests/base.pp | 8 +++---- manifests/centos.pp | 3 ++- manifests/deliver.pp | 4 +++- manifests/expire.pp | 5 ++-- manifests/expire/sqlite.pp | 27 +++++++++++---------- manifests/logrotate.pp | 2 ++ manifests/managesieve.pp | 4 ++-- manifests/munin.pp | 6 ++--- manifests/quota.pp | 3 ++- manifests/sieve.pp | 60 ++++++++++++++++++++++++---------------------- manifests/sql.pp | 3 ++- manifests/sql/mysql.pp | 3 ++- manifests/sql/pgsql.pp | 3 ++- manifests/sql/sqlite.pp | 3 ++- 14 files changed, 76 insertions(+), 58 deletions(-) diff --git a/manifests/base.pp b/manifests/base.pp index b94ed5e..2043359 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -5,7 +5,7 @@ class dovecot::base { ensure => installed, } - file{'/etc/dovecot.conf': + file { '/etc/dovecot.conf': source => [ "puppet:///modules/site-dovecot/config/${fqdn}/dovecot.conf", "puppet:///modules/site-dovecot/config/${dovecot::type}/dovecot.conf", "puppet:///modules/site-dovecot/config/dovecot.conf", @@ -16,13 +16,13 @@ class dovecot::base { owner => root, group => mail, mode => 0640; } - file{'/var/log/dovecot': + file { '/var/log/dovecot': ensure => directory, require => Package['dovecot'], before => Service['dovecot'], owner => dovecot, group => 12, mode => 0660, } - file{ [ '/var/log/dovecot/error.log', + file { [ '/var/log/dovecot/error.log', '/var/log/dovecot/infos.log' ]: require => Package['dovecot'], before => Service['dovecot'], @@ -31,7 +31,7 @@ class dovecot::base { include dovecot::logrotate - service{'dovecot': + service { 'dovecot': ensure => running, enable => true, } diff --git a/manifests/centos.pp b/manifests/centos.pp index 8d6e067..22caab3 100644 --- a/manifests/centos.pp +++ b/manifests/centos.pp @@ -1,5 +1,6 @@ class dovecot::centos inherits dovecot::base { - file{'/etc/sysconfig/dovecot': + + file { '/etc/sysconfig/dovecot': source => [ "puppet:///modules/site-dovecot/sysconfig/${fqdn}/dovecot", "puppet:///modules/site-dovecot/sysconfig/${dovecot::type}/dovecot", "puppet:///modules/site-dovecot/sysconfig/dovecot", diff --git a/manifests/deliver.pp b/manifests/deliver.pp index c501ebe..da190f1 100644 --- a/manifests/deliver.pp +++ b/manifests/deliver.pp @@ -1,6 +1,8 @@ class dovecot::deliver { + include ::dovecot - file{ [ '/var/log/dovecot/deliver.log', + + file { [ '/var/log/dovecot/deliver.log', '/var/log/dovecot/deliver-error.log' ]: require => Package['dovecot'], before => Service['dovecot'], diff --git a/manifests/expire.pp b/manifests/expire.pp index 2c9bc17..9d53bb4 100644 --- a/manifests/expire.pp +++ b/manifests/expire.pp @@ -1,7 +1,8 @@ class dovecot::expire { + include ::dovecot - file{'/etc/cron.daily/dovecot-expire': + file { '/etc/cron.daily/dovecot-expire': owner => root, group => 0, mode => 0755; } if $dovecot_expire_type == 'legacy' or $dovecot_expire_type == 'mixed' { @@ -34,7 +35,7 @@ class dovecot::expire { owner => root, group => 0, mode => 0600; } - file{'/usr/libexec/dovecot/expire-tool.sh': + file { '/usr/libexec/dovecot/expire-tool.sh': source => "puppet:///modules/dovecot/expire/expire-tool.sh", owner => root, group => 0, mode => 0700; } diff --git a/manifests/expire/sqlite.pp b/manifests/expire/sqlite.pp index a9fed4b..a3c4a7d 100644 --- a/manifests/expire/sqlite.pp +++ b/manifests/expire/sqlite.pp @@ -1,19 +1,22 @@ class dovecot::expire::sqlite { + include ::sqlite - file{'/var/lib/dovecot/expire.db': - ensure => file, - replace => false, - require => Package['sqlite'], - owner => root, group => 0, mode => 0600; - } - file{'/var/lib/dovecot/expire.sql': - source => "puppet:///modules/dovecot/expire/expire.sqlite.sql", - require => File['/var/lib/dovecot/expire.db'], - notify => Exec['create_expire_db'], - owner => root, group => 0, mode => 0600; + + file { + '/var/lib/dovecot/expire.db': + ensure => file, + replace => false, + require => Package['sqlite'], + owner => root, group => 0, mode => 0600; + + '/var/lib/dovecot/expire.sql': + source => "puppet:///modules/dovecot/expire/expire.sqlite.sql", + require => File['/var/lib/dovecot/expire.db'], + notify => Exec['create_expire_db'], + owner => root, group => 0, mode => 0600; } - exec{'create_expire_db': + exec { 'create_expire_db': command => 'cat /var/lib/dovecot/expire.sql | sqlite3 /var/lib/dovecot/expire.db', refreshonly => true, } diff --git a/manifests/logrotate.pp b/manifests/logrotate.pp index a26e1c2..1457eb1 100644 --- a/manifests/logrotate.pp +++ b/manifests/logrotate.pp @@ -1,5 +1,7 @@ class dovecot::logrotate { + include logrotate + augeas { "logrotate_dovecot": context => "/files/etc/logrotate.d/dovecot/rule", diff --git a/manifests/managesieve.pp b/manifests/managesieve.pp index 0343ed7..2cbe86d 100644 --- a/manifests/managesieve.pp +++ b/manifests/managesieve.pp @@ -5,7 +5,7 @@ class dovecot::managesieve( 'sieve-hostname' => $fqdn, } ) { - package{'dovecot-managesieve': + package { 'dovecot-managesieve': ensure => installed, before => Service['dovecot'], } @@ -18,7 +18,7 @@ class dovecot::managesieve( } if $dovecot::managesieve::nagios_checks { - nagios::service{"managesieve": + nagios::service { "managesieve": check_command => "check_managesieve!${dovecot::managesieve::nagios_checks['sieve-hostname']}"; } } diff --git a/manifests/munin.pp b/manifests/munin.pp index 9d05de8..77e6c5c 100644 --- a/manifests/munin.pp +++ b/manifests/munin.pp @@ -1,7 +1,7 @@ class dovecot::munin { - munin::plugin::deploy{'dovecot': + + munin::plugin::deploy { 'dovecot': source => "dovecot/munin/dovecot", - config => "env.logfile /var/log/dovecot/infos.log -group mail" + config => "env.logfile /var/log/dovecot/infos.log\ngroup mail" } } diff --git a/manifests/quota.pp b/manifests/quota.pp index 78fb407..a36fac0 100644 --- a/manifests/quota.pp +++ b/manifests/quota.pp @@ -1,5 +1,6 @@ class dovecot::quota { - file{'/usr/libexec/dovecot/quota-warning.sh': + + file { '/usr/libexec/dovecot/quota-warning.sh': source => [ "puppet:///modules/site-dovecot/quota/quota-warning.sh", "puppet:///modules/dovecot/quota/quota-warning.sh" ], require => Package['dovecot'], diff --git a/manifests/sieve.pp b/manifests/sieve.pp index 60a6cd9..81f2a1a 100644 --- a/manifests/sieve.pp +++ b/manifests/sieve.pp @@ -1,38 +1,42 @@ class dovecot::sieve { + include ::dovecot - package{'dovecot-sieve': + + package { 'dovecot-sieve': ensure => installed, before => Service['dovecot'], } - file{'/var/lib/dovecot-sieve': - ensure => directory, - owner => root, group => 0, mode => 0644; - } - file{'/var/lib/dovecot-sieve/global': - ensure => directory, - recurse => true, - purge => true, - force => true, - notify => Exec['compile_global_sieve'], - owner => root, group => root, mode => 0644; - } - file{'/var/lib/dovecot-sieve/default.sieve': - source => [ "puppet:///modules/site-dovecot/sieve/${fqdn}/default.sieve", - "puppet:///modules/site-dovecot/sieve/default.sieve", - "puppet:///modules/dovecot/sieve/${operatingsystem}/default.sieve", - "puppet:///modules/dovecot/sieve/default.sieve" ], - notify => Exec['compile_default_sieve'], - owner => root, group => root, mode => 0644; - } + file { + '/var/lib/dovecot-sieve': + ensure => directory, + owner => root, group => 0, mode => 0644; + + '/var/lib/dovecot-sieve/global': + ensure => directory, + recurse => true, + purge => true, + force => true, + notify => Exec['compile_global_sieve'], + owner => root, group => root, mode => 0644; - exec{'compile_default_sieve': - command => 'sievec /var/lib/dovecot-sieve/default.sieve', - creates => '/var/lib/dovecot-sieve/default.svbin', - require => File['/var/lib/dovecot-sieve/default.sieve'], + '/var/lib/dovecot-sieve/default.sieve': + source => [ "puppet:///modules/site-dovecot/sieve/${fqdn}/default.sieve", + "puppet:///modules/site-dovecot/sieve/default.sieve", + "puppet:///modules/dovecot/sieve/${operatingsystem}/default.sieve", + "puppet:///modules/dovecot/sieve/default.sieve" ], + notify => Exec['compile_default_sieve'], + owner => root, group => root, mode => 0644; } - exec{'compile_global_sieve': - command => 'sievec /var/lib/dovecot-sieve/global/', - refreshonly => true, + + exec { + 'compile_default_sieve': + command => 'sievec /var/lib/dovecot-sieve/default.sieve', + creates => '/var/lib/dovecot-sieve/default.svbin', + require => File['/var/lib/dovecot-sieve/default.sieve']; + + 'compile_global_sieve': + command => 'sievec /var/lib/dovecot-sieve/global/', + refreshonly => true; } } diff --git a/manifests/sql.pp b/manifests/sql.pp index b9c9248..a231239 100644 --- a/manifests/sql.pp +++ b/manifests/sql.pp @@ -1,5 +1,6 @@ class dovecot::sql { - file{'/etc/dovecot-sql.conf': + + file { '/etc/dovecot-sql.conf': source => [ "puppet:///modules/site-dovecot/sql/${fqdn}/dovecot-sql.conf", "puppet:///modules/site-dovecot/sql/${dovecot::type}/dovecot-sql.conf", "puppet:///modules/site-dovecot/sql/dovecot-sql.conf", diff --git a/manifests/sql/mysql.pp b/manifests/sql/mysql.pp index 378ed41..95149d7 100644 --- a/manifests/sql/mysql.pp +++ b/manifests/sql/mysql.pp @@ -1,5 +1,6 @@ class dovecot::sql::mysql { - package{'dovecot-mysql': + + package { 'dovecot-mysql': ensure => installed, before => File['/etc/dovecot-sql.conf'], } diff --git a/manifests/sql/pgsql.pp b/manifests/sql/pgsql.pp index 530e878..8fa2ae1 100644 --- a/manifests/sql/pgsql.pp +++ b/manifests/sql/pgsql.pp @@ -1,5 +1,6 @@ class dovecot::sql::pgsql { - package{'dovecot-pgsql': + + package { 'dovecot-pgsql': ensure => installed, before => File['/etc/dovecot-sql.conf'], } diff --git a/manifests/sql/sqlite.pp b/manifests/sql/sqlite.pp index bc07fb7..5a2bb06 100644 --- a/manifests/sql/sqlite.pp +++ b/manifests/sql/sqlite.pp @@ -1,5 +1,6 @@ class dovecot::sql::sqlite { - package{'dovecot-sqlite': + + package { 'dovecot-sqlite': ensure => installed, before => File['/etc/dovecot-sql.conf'], } -- cgit v1.2.3