diff options
| author | mh <mh@immerda.ch> | 2010-12-12 17:57:40 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-12-12 17:57:40 +0100 |
| commit | c52d8343fe099bf20c5c39662a75ae0edc05f241 (patch) | |
| tree | a2ab939510aef2a0846ac8ff94923e65b00a6794 | |
| parent | f06a31f8c166dfc520b2dd57f557f199fcc1d122 (diff) | |
as we are already in the dovecot type we can take the prefix away
| -rw-r--r-- | manifests/base.pp | 2 | ||||
| -rw-r--r-- | manifests/centos.pp | 2 | ||||
| -rw-r--r-- | manifests/init.pp | 2 | ||||
| -rw-r--r-- | manifests/sql.pp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 44f0463..85024ce 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -5,7 +5,7 @@ class dovecot::base { file{'/etc/dovecot.conf': source => [ "puppet:///modules/site-dovecot/config/${fqdn}/dovecot.conf", - "puppet:///modules/site-dovecot/config/${dovecot::dovecot_type}/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" ], diff --git a/manifests/centos.pp b/manifests/centos.pp index 22a6be0..8d6e067 100644 --- a/manifests/centos.pp +++ b/manifests/centos.pp @@ -1,7 +1,7 @@ class dovecot::centos inherits dovecot::base { file{'/etc/sysconfig/dovecot': source => [ "puppet:///modules/site-dovecot/sysconfig/${fqdn}/dovecot", - "puppet:///modules/site-dovecot/sysconfig/${dovecot::dovecot_type}/dovecot", + "puppet:///modules/site-dovecot/sysconfig/${dovecot::type}/dovecot", "puppet:///modules/site-dovecot/sysconfig/dovecot", "puppet:///modules/dovecot/sysconfig/dovecot" ], require => Package['dovecot'], diff --git a/manifests/init.pp b/manifests/init.pp index 75146fd..d7e0e9e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,6 +1,6 @@ # we take rpms from fedora class dovecot( - $dovecot_type = 'some_unkown_type', + $type = 'some_unkown_type', $sqlite = false, $pgsql = false, $mysql = false, diff --git a/manifests/sql.pp b/manifests/sql.pp index c07de17..b9c9248 100644 --- a/manifests/sql.pp +++ b/manifests/sql.pp @@ -1,7 +1,7 @@ class dovecot::sql { file{'/etc/dovecot-sql.conf': source => [ "puppet:///modules/site-dovecot/sql/${fqdn}/dovecot-sql.conf", - "puppet:///modules/site-dovecot/sql/${dovecot::dovecot_type}/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" ], |