From 8ebe49c6d20bd2fd7d59303d193fe941742bb1e7 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 30 Aug 2011 15:12:40 -0400 Subject: add mysql expire capability, provides a mysql-dict-expire.conf --- manifests/expire/mysql.pp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 manifests/expire/mysql.pp (limited to 'manifests/expire/mysql.pp') diff --git a/manifests/expire/mysql.pp b/manifests/expire/mysql.pp new file mode 100644 index 0000000..f356d8e --- /dev/null +++ b/manifests/expire/mysql.pp @@ -0,0 +1,20 @@ +class dovecot::expire::mysql { + + file { 'dovecot-dict-expire.conf': + source => [ "puppet:///modules/site-dovecot/expire/${fqdn}/mysql-dict-expire.conf", + "puppet:///modules/site-dovecot/expire/mysql-dict-expire.conf", + "puppet:///modules/dovecot/expire/${operatingsystem}/mysql-dict-expire.conf", + "puppet:///modules/dovecot/expire/mysql-dict-expire.conf", + path => $operatingsystem ? { + 'debian' => '/etc/dovecot/dovecot-dict-expire.conf', + default => '/etc/dovecot-dict-expire.conf' + }, + require => $operatingsystem ? { + 'debian' => Package['dovecot-common'], + default => Package['dovecot-mysql'], + }, + notify => Service['dovecot'], + owner => root, group => 0, mode => 0600; + } + +} -- cgit v1.2.3 From 4a9cbc686d94e8ad92e4fc40641e71b695b2d928 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 30 Aug 2011 15:36:44 -0400 Subject: fix another syntax error --- manifests/expire/mysql.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/expire/mysql.pp') diff --git a/manifests/expire/mysql.pp b/manifests/expire/mysql.pp index f356d8e..131636d 100644 --- a/manifests/expire/mysql.pp +++ b/manifests/expire/mysql.pp @@ -4,7 +4,7 @@ class dovecot::expire::mysql { source => [ "puppet:///modules/site-dovecot/expire/${fqdn}/mysql-dict-expire.conf", "puppet:///modules/site-dovecot/expire/mysql-dict-expire.conf", "puppet:///modules/dovecot/expire/${operatingsystem}/mysql-dict-expire.conf", - "puppet:///modules/dovecot/expire/mysql-dict-expire.conf", + "puppet:///modules/dovecot/expire/mysql-dict-expire.conf" ], path => $operatingsystem ? { 'debian' => '/etc/dovecot/dovecot-dict-expire.conf', default => '/etc/dovecot-dict-expire.conf' -- cgit v1.2.3 From d574f0f84b3fa8d938147da3b6423ebfac775a2f Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 30 Aug 2011 15:40:36 -0400 Subject: fix debian dovecot package dependency for dovecot-common --- manifests/expire/mysql.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/expire/mysql.pp') diff --git a/manifests/expire/mysql.pp b/manifests/expire/mysql.pp index 131636d..01b72f6 100644 --- a/manifests/expire/mysql.pp +++ b/manifests/expire/mysql.pp @@ -10,7 +10,7 @@ class dovecot::expire::mysql { default => '/etc/dovecot-dict-expire.conf' }, require => $operatingsystem ? { - 'debian' => Package['dovecot-common'], + 'debian' => Package['dovecot'], default => Package['dovecot-mysql'], }, notify => Service['dovecot'], -- cgit v1.2.3 From 6ed512ba710312d05936261fe0873e255c27364f Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Fri, 2 Sep 2011 16:35:24 -0400 Subject: add version dependency to the expire package requirement --- manifests/expire/mysql.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'manifests/expire/mysql.pp') diff --git a/manifests/expire/mysql.pp b/manifests/expire/mysql.pp index 01b72f6..aa9d1bd 100644 --- a/manifests/expire/mysql.pp +++ b/manifests/expire/mysql.pp @@ -9,9 +9,9 @@ class dovecot::expire::mysql { 'debian' => '/etc/dovecot/dovecot-dict-expire.conf', default => '/etc/dovecot-dict-expire.conf' }, - require => $operatingsystem ? { - 'debian' => Package['dovecot'], - default => Package['dovecot-mysql'], + require => $version ? { + 2 => Package['dovecot-mysql'], + default => Package['dovecot'], }, notify => Service['dovecot'], owner => root, group => 0, mode => 0600; -- 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/expire/mysql.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/expire/mysql.pp') diff --git a/manifests/expire/mysql.pp b/manifests/expire/mysql.pp index aa9d1bd..5256d60 100644 --- a/manifests/expire/mysql.pp +++ b/manifests/expire/mysql.pp @@ -1,8 +1,8 @@ class dovecot::expire::mysql { file { 'dovecot-dict-expire.conf': - source => [ "puppet:///modules/site-dovecot/expire/${fqdn}/mysql-dict-expire.conf", - "puppet:///modules/site-dovecot/expire/mysql-dict-expire.conf", + source => [ "puppet:///modules/site_dovecot/expire/${fqdn}/mysql-dict-expire.conf", + "puppet:///modules/site_dovecot/expire/mysql-dict-expire.conf", "puppet:///modules/dovecot/expire/${operatingsystem}/mysql-dict-expire.conf", "puppet:///modules/dovecot/expire/mysql-dict-expire.conf" ], path => $operatingsystem ? { -- cgit v1.2.3