diff options
author | Michael Scherer <misc@mageia.org> | 2012-03-22 15:18:24 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2012-03-22 15:18:24 +0000 |
commit | 6c686c242f8b05fd88cd977cb250c250dcf6104c (patch) | |
tree | 93145719973dcb8f8a1de28a024f0fb19e59ea23 /modules/postfix/manifests/init.pp | |
parent | 040e85305d9d750c7e9d7792aa6abfa4317cbf44 (diff) | |
download | puppet-6c686c242f8b05fd88cd977cb250c250dcf6104c.tar puppet-6c686c242f8b05fd88cd977cb250c250dcf6104c.tar.gz puppet-6c686c242f8b05fd88cd977cb250c250dcf6104c.tar.bz2 puppet-6c686c242f8b05fd88cd977cb250c250dcf6104c.tar.xz puppet-6c686c242f8b05fd88cd977cb250c250dcf6104c.zip |
clean postfix module, rework the layout and split it in several file
Diffstat (limited to 'modules/postfix/manifests/init.pp')
-rw-r--r-- | modules/postfix/manifests/init.pp | 72 |
1 files changed, 7 insertions, 65 deletions
diff --git a/modules/postfix/manifests/init.pp b/modules/postfix/manifests/init.pp index 5722e3e0..e13e86b5 100644 --- a/modules/postfix/manifests/init.pp +++ b/modules/postfix/manifests/init.pp @@ -1,71 +1,13 @@ class postfix { - class base { - package { [postfix,nail]: } + package { ['postfix', 'nail']: } - service { postfix: - subscribe => Package['postfix'], - } - - file { '/etc/postfix/main.cf': - require => Package["postfix"], - content => "", - notify => Service['postfix'], - } - } - - - class simple_relay inherits base { - File['/etc/postfix/main.cf'] { - content => template("postfix/simple_relay_main.cf"), - } - } - - class smtp_server inherits base { - include postgrey - include amavis - include spamassassin - - File['/etc/postfix/main.cf'] { - content => template("postfix/main.cf"), - } - - file { '/etc/postfix/transport_regexp': - content => template("postfix/transport_regexp"), - } - - } - - class primary_smtp inherits smtp_server { - - package { "postfix-ldap": } - - # council is here until we fully decide who has aliases in com team, - # see https://bugs.mageia.org/show_bug.cgi?id=1345 - # alumini is a special group for tracking previous members of - # the project, so they keep their aliases for a time - $aliases_group = ['mga-founders','mga-packagers', - 'mga-sysadmin','mga-council', - 'mga-alumni','mga-i18n-committers', - ] - $ldap_password = extlookup("postfix_ldap",'x') - $ldap_servers = get_ldap_servers() - - file { - '/etc/postfix/master.cf': content => template("postfix/primary_master.cf"); - '/etc/postfix/ldap_aliases.conf': content => template("postfix/ldap_aliases.conf"); - # TODO merge the file with the previous one, for common part (ldap, etc) - '/etc/postfix/group_aliases.conf': content => template("postfix/group_aliases.conf"); - # TODO make it conditional to the presence of sympa - '/etc/postfix/sympa_aliases': content => template("postfix/sympa_aliases"); - '/etc/postfix/virtual_aliases': content => template("postfix/virtual_aliases"); - } - - exec { "postmap /etc/postfix/virtual_aliases": - refreshonly => true, - subscribe => File['/etc/postfix/virtual_aliases'], - } + service { 'postfix': + subscribe => Package['postfix'], } - class secondary_smtp inherits smtp_server { + file { '/etc/postfix/main.cf': + require => Package['postfix'], + content => '', + notify => Service['postfix'], } } |