diff options
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/base.pp | 10 | ||||
-rw-r--r-- | manifests/expire.pp | 10 | ||||
-rw-r--r-- | manifests/expire/sqlite.pp | 2 | ||||
-rw-r--r-- | manifests/quota.pp | 4 | ||||
-rw-r--r-- | manifests/sieve.pp | 18 | ||||
-rw-r--r-- | manifests/sql.pp | 10 |
6 files changed, 27 insertions, 27 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index cddd27f..935521b 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -4,11 +4,11 @@ class dovecot::base { } file{'/etc/dovecot.conf': - source => [ "puppet://$server/modules/site-dovecot/config/${fqdn}/dovecot.conf", - "puppet://$server/modules/site-dovecot/config/${dovecot_type}/dovecot.conf", - "puppet://$server/modules/site-dovecot/config/dovecot.conf", - "puppet://$server/modules/site/config/${operatingsystem}/dovecot.conf", - "puppet://$server/modules/site/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/site/config/${operatingsystem}/dovecot.conf", + "puppet:///modules/site/config/dovecot.conf" ], require => Package['dovecot'], notify => Service['dovecot'], owner => root, group => mail, mode => 0640; diff --git a/manifests/expire.pp b/manifests/expire.pp index a33f0e3..2c9bc17 100644 --- a/manifests/expire.pp +++ b/manifests/expire.pp @@ -25,17 +25,17 @@ class dovecot::expire { if $dovecot_expire_type != 'legacy' { file{'/etc/dovecot-expire.conf': - source => [ "puppet://$server/modules/site-dovecot/expire/${fqdn}/dovecot-expire.conf", - "puppet://$server/modules/site-dovecot/expire/dovecot-expire.conf", - "puppet://$server/modules/dovecot/expire/${operatingsystem}/dovecot-expire.conf", - "puppet://$server/modules/dovecot/expire/dovecot-expire.conf" ], + source => [ "puppet:///modules/site-dovecot/expire/${fqdn}/dovecot-expire.conf", + "puppet:///modules/site-dovecot/expire/dovecot-expire.conf", + "puppet:///modules/dovecot/expire/${operatingsystem}/dovecot-expire.conf", + "puppet:///modules/dovecot/expire/dovecot-expire.conf" ], require => Package['dovecot'], notify => Service['dovecot'], owner => root, group => 0, mode => 0600; } file{'/usr/libexec/dovecot/expire-tool.sh': - source => "puppet://$server/modules/dovecot/expire/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 2de7291..a9fed4b 100644 --- a/manifests/expire/sqlite.pp +++ b/manifests/expire/sqlite.pp @@ -7,7 +7,7 @@ class dovecot::expire::sqlite { owner => root, group => 0, mode => 0600; } file{'/var/lib/dovecot/expire.sql': - source => "puppet://$server/modules/dovecot/expire/expire.sqlite.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; diff --git a/manifests/quota.pp b/manifests/quota.pp index 1ced2f2..78fb407 100644 --- a/manifests/quota.pp +++ b/manifests/quota.pp @@ -1,7 +1,7 @@ class dovecot::quota { file{'/usr/libexec/dovecot/quota-warning.sh': - source => [ "puppet://$server/modules/site-dovecot/quota/quota-warning.sh", - "puppet://$server/modules/dovecot/quota/quota-warning.sh" ], + source => [ "puppet:///modules/site-dovecot/quota/quota-warning.sh", + "puppet:///modules/dovecot/quota/quota-warning.sh" ], require => Package['dovecot'], before => Service['dovecot'], owner => root, group => 0, mode => 0755; diff --git a/manifests/sieve.pp b/manifests/sieve.pp index 73d1829..31b7a15 100644 --- a/manifests/sieve.pp +++ b/manifests/sieve.pp @@ -10,11 +10,11 @@ class dovecot::sieve { owner => root, group => 0, mode => 0644; } file{'/var/lib/dovecot-sieve/global': - source => [ "puppet://$server/modules/site-dovecot/sieve/${fqdn}/global/", - "puppet://$server/modules/site-dovecot/sieve/global/", - "puppet://$server/modules/dovecot/sieve/${operatingsystem}/global/", - "puppet://$server/modules/dovecot/sieve/global/", - "puppet://$server/modules/common/empty/" ], + source => [ "puppet:///modules/site-dovecot/sieve/${fqdn}/global/", + "puppet:///modules/site-dovecot/sieve/global/", + "puppet:///modules/dovecot/sieve/${operatingsystem}/global/", + "puppet:///modules/dovecot/sieve/global/", + "puppet:///modules/common/empty/" ], ensure => directory, recurse => true, purge => true, @@ -23,10 +23,10 @@ class dovecot::sieve { owner => root, group => root, mode => 0644; } file{'/var/lib/dovecot-sieve/default.sieve': - source => [ "puppet://$server/modules/site-dovecot/sieve/${fqdn}/default.sieve", - "puppet://$server/modules/site-dovecot/sieve/default.sieve", - "puppet://$server/modules/dovecot/sieve/${operatingsystem}/default.sieve", - "puppet://$server/modules/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; } diff --git a/manifests/sql.pp b/manifests/sql.pp index f7cf657..c4ddc04 100644 --- a/manifests/sql.pp +++ b/manifests/sql.pp @@ -1,10 +1,10 @@ class dovecot::sql { file{'/etc/dovecot-sql.conf': - source => [ "puppet://$server/modules/site-dovecot/sql/${fqdn}/dovecot-sql.conf", - "puppet://$server/modules/site-dovecot/sql/${dovecot_type}/dovecot-sql.conf", - "puppet://$server/modules/site-dovecot/sql/dovecot-sql.conf", - "puppet://$server/modules/site/sql/${operatingsystem}/dovecot-sql.conf", - "puppet://$server/modules/site/sql/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", + "puppet:///modules/site/sql/${operatingsystem}/dovecot-sql.conf", + "puppet:///modules/site/sql/dovecot-sql.conf" ], require => Package['dovecot'], notify => Service['dovecot'], owner => root, group => 0, mode => 0600; |