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/sql/mysql.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'manifests/sql/mysql.pp') 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'], } -- cgit v1.2.3 From efd742c81f629d653b9d9a29a400f37d0a44dee9 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Fri, 2 Sep 2011 16:31:32 -0400 Subject: the new version of dovecot (version 2) has a number of differences from version 1, so I added a $version class parameter (defaulting to 2) so we can have different configurations for the different versions. for version 2, debian does have different sql packages, so we test the above variable before attempting to install the packages, rather than test for the $operatingsystem in sql.pp --- manifests/sql/mysql.pp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'manifests/sql/mysql.pp') diff --git a/manifests/sql/mysql.pp b/manifests/sql/mysql.pp index 95149d7..f4c1a4a 100644 --- a/manifests/sql/mysql.pp +++ b/manifests/sql/mysql.pp @@ -1,7 +1,9 @@ class dovecot::sql::mysql { - package { 'dovecot-mysql': - ensure => installed, - before => File['/etc/dovecot-sql.conf'], + if $version == 2 { + package { 'dovecot-mysql': + ensure => installed, + before => File['/etc/dovecot-sql.conf'], + } } } -- cgit v1.2.3 From 9a7d3591d4e39e5be5d8612ab519252583f35314 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 10 Nov 2011 13:51:01 -0500 Subject: add the dovecot-dict-sql.conf to the dovecot::sql class --- manifests/sql/mysql.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/sql/mysql.pp') diff --git a/manifests/sql/mysql.pp b/manifests/sql/mysql.pp index f4c1a4a..56cbb13 100644 --- a/manifests/sql/mysql.pp +++ b/manifests/sql/mysql.pp @@ -3,7 +3,7 @@ class dovecot::sql::mysql { if $version == 2 { package { 'dovecot-mysql': ensure => installed, - before => File['/etc/dovecot-sql.conf'], + before => [ File['/etc/dovecot-sql.conf'], File['/etc/dovecot-dict-sql.conf'] ]; } } } -- cgit v1.2.3