From f9f6fc3be8b2e3e840dbf85d497160f14ba82ce8 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 22 Aug 2011 16:46:36 -0400 Subject: add preliminary support for debian --- manifests/base.pp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'manifests/base.pp') diff --git a/manifests/base.pp b/manifests/base.pp index 85024ce..b94ed5e 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,5 +1,7 @@ class dovecot::base { - package{'dovecot': + + package { 'dovecot': + alias => 'dovecot', ensure => installed, } -- cgit v1.2.3 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 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'manifests/base.pp') 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, } -- cgit v1.2.3 From 60d8665378156633404b7bd3c1cfa81c5c6368d0 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 31 Aug 2011 16:15:25 -0400 Subject: formatting standardization --- manifests/base.pp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'manifests/base.pp') diff --git a/manifests/base.pp b/manifests/base.pp index 2043359..c610128 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -16,17 +16,18 @@ class dovecot::base { owner => root, group => mail, mode => 0640; } - file { '/var/log/dovecot': - ensure => directory, - require => Package['dovecot'], - before => Service['dovecot'], - owner => dovecot, group => 12, mode => 0660, - } - file { [ '/var/log/dovecot/error.log', - '/var/log/dovecot/infos.log' ]: + file { + '/var/log/dovecot': + ensure => directory, require => Package['dovecot'], before => Service['dovecot'], - owner => root, group => 12, mode => 0660; + owner => dovecot, group => 12, mode => 0660; + + [ '/var/log/dovecot/error.log', + '/var/log/dovecot/infos.log' ]: + require => Package['dovecot'], + before => Service['dovecot'], + owner => root, group => 12, mode => 0660; } include dovecot::logrotate -- cgit v1.2.3 From 4c8f3d458efafaadf1c97564ce5e83f8026afbb1 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 31 Aug 2011 16:15:58 -0400 Subject: switch group ownership of the logfiles from gid=12, to 'dovecot', gid=12 is not universal --- manifests/base.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/base.pp') diff --git a/manifests/base.pp b/manifests/base.pp index c610128..522b99e 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -21,13 +21,13 @@ class dovecot::base { ensure => directory, require => Package['dovecot'], before => Service['dovecot'], - owner => dovecot, group => 12, mode => 0660; + owner => dovecot, group => dovecot, mode => 0660; [ '/var/log/dovecot/error.log', '/var/log/dovecot/infos.log' ]: require => Package['dovecot'], before => Service['dovecot'], - owner => root, group => 12, mode => 0660; + owner => root, group => dovecot, mode => 0660; } include dovecot::logrotate -- cgit v1.2.3 From 15eb3c72a9ace055a9679a880ec2f1957459f204 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 31 Aug 2011 16:17:46 -0400 Subject: change the dovecot logfile to the more standard 'dovecot.log' instead of 'infos.log' also fix the group for the munin plugin --- manifests/base.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/base.pp') diff --git a/manifests/base.pp b/manifests/base.pp index 522b99e..e275a99 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -24,7 +24,7 @@ class dovecot::base { owner => dovecot, group => dovecot, mode => 0660; [ '/var/log/dovecot/error.log', - '/var/log/dovecot/infos.log' ]: + '/var/log/dovecot/dovecot.log' ]: require => Package['dovecot'], before => Service['dovecot'], owner => root, group => dovecot, mode => 0660; -- cgit v1.2.3 From cab934f909690ce57e222a2ed5d6a53c74679191 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 10 Nov 2011 13:51:55 -0500 Subject: add dovecot::config::file to be able to handle the different /etc/dovecot/conf.d files (similar to nginx/apache module) --- manifests/base.pp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'manifests/base.pp') diff --git a/manifests/base.pp b/manifests/base.pp index e275a99..949935e 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,10 +1,5 @@ class dovecot::base { - - package { 'dovecot': - alias => 'dovecot', - ensure => installed, - } - + file { '/etc/dovecot.conf': source => [ "puppet:///modules/site-dovecot/config/${fqdn}/dovecot.conf", "puppet:///modules/site-dovecot/config/${dovecot::type}/dovecot.conf", @@ -15,6 +10,13 @@ class dovecot::base { notify => Service['dovecot'], owner => root, group => mail, mode => 0640; } + + file { 'config_dir': + path => '/etc/dovecot/conf.d', + ensure => directory, + require => Package['dovecot'], + owner => dovecot, group => 0, mode => 0755; + } file { '/var/log/dovecot': @@ -29,6 +31,11 @@ class dovecot::base { before => Service['dovecot'], owner => root, group => dovecot, mode => 0660; } + + package { 'dovecot': + alias => 'dovecot', + ensure => installed, + } include dovecot::logrotate -- cgit v1.2.3 From dca386b40c22892245e0a8b9b6ab4853fca1412a Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 27 Jun 2012 12:18:10 -0400 Subject: switch to 2.7 requirement of underscores instead of hyphens --- manifests/base.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'manifests/base.pp') diff --git a/manifests/base.pp b/manifests/base.pp index 949935e..455e286 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,9 +1,9 @@ class dovecot::base { 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", + 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", "puppet:///modules/dovecot/config/${operatingsystem}/dovecot.conf", "puppet:///modules/dovecot/config/dovecot.conf" ], require => Package['dovecot'], -- cgit v1.2.3 From 9e3327c05f4cba6ea6d95b627599cbb61154dfd3 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 7 Oct 2013 12:39:16 -0400 Subject: fix logrotation for newer logrotate: With the old permissions, it wouldn't rotate because of: error: skipping "/var/log/dovecot/dovecot.log" because parent directory has insecure permissions (It's world writable or writable by group which is not "root") Set "su" directive in config file to tell logrotate which user/group should be used for rotation. So we fix the /var/log/dovecot permissions, and change the owner of the log files to dovecot --- manifests/base.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/base.pp') diff --git a/manifests/base.pp b/manifests/base.pp index 455e286..6960c8a 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -23,7 +23,7 @@ class dovecot::base { ensure => directory, require => Package['dovecot'], before => Service['dovecot'], - owner => dovecot, group => dovecot, mode => 0660; + owner => dovecot, group => dovecot, mode => 0750; [ '/var/log/dovecot/error.log', '/var/log/dovecot/dovecot.log' ]: -- cgit v1.2.3 From 0c57b954d1b33da8d6b44bb45db0dd71dd929ee5 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 9 Dec 2013 19:52:46 -0500 Subject: some linting, and make the 'config_dir' name be more specifically 'dovecot_config_dir' to not be greedy in the namespace --- manifests/base.pp | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) (limited to 'manifests/base.pp') diff --git a/manifests/base.pp b/manifests/base.pp index 6960c8a..7eff064 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,40 +1,48 @@ class dovecot::base { - + 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", - "puppet:///modules/dovecot/config/${operatingsystem}/dovecot.conf", - "puppet:///modules/dovecot/config/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', + "puppet:///modules/dovecot/config/${::operatingsystem}/dovecot.conf", + 'puppet:///modules/dovecot/config/dovecot.conf' ], require => Package['dovecot'], - notify => Service['dovecot'], - owner => root, group => mail, mode => 0640; + notify => Service['dovecot'], + owner => root, + group => mail, + mode => '0640'; } - - file { 'config_dir': - path => '/etc/dovecot/conf.d', - ensure => directory, + + file { 'dovecot_config_dir': + ensure => directory, + path => '/etc/dovecot/conf.d', require => Package['dovecot'], - owner => dovecot, group => 0, mode => 0755; + owner => dovecot, + group => 0, + mode => '0755'; } file { '/var/log/dovecot': - ensure => directory, + ensure => directory, require => Package['dovecot'], - before => Service['dovecot'], - owner => dovecot, group => dovecot, mode => 0750; + before => Service['dovecot'], + owner => dovecot, + group => dovecot, + mode => '0750'; [ '/var/log/dovecot/error.log', '/var/log/dovecot/dovecot.log' ]: require => Package['dovecot'], - before => Service['dovecot'], - owner => root, group => dovecot, mode => 0660; + before => Service['dovecot'], + owner => root, + group => dovecot, + mode => '0660'; } - + package { 'dovecot': - alias => 'dovecot', ensure => installed, + alias => 'dovecot' } include dovecot::logrotate -- cgit v1.2.3 From 34333c48ba5662228c37a70eb099ec9a5f96b5ac Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 23 Jan 2014 15:30:53 +0100 Subject: change mode for /etc/dovecot.conf from 0640 to 0644 we couldn't find another way to get around this error when postfix tries to deliver a mail via the dovecot relay: postfix/pipe[22438]: 5951215E04: to=<...>, orig_to=<...>, relay=dovecot, delay=0.02, delays=0.01/0/0/0.01, dsn=4.3.0, status=deferred (temporary failure. Command output: doveconf: Fatal: open(/etc/dovecot/dovecot.conf) failed: Permission denied ) the debian package ships this file also with mode 0644 so we think there's no security flaw with this change. --- manifests/base.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/base.pp') diff --git a/manifests/base.pp b/manifests/base.pp index 7eff064..34728f3 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -10,7 +10,7 @@ class dovecot::base { notify => Service['dovecot'], owner => root, group => mail, - mode => '0640'; + mode => '0644'; } file { 'dovecot_config_dir': -- cgit v1.2.3