We seem to reject all mails to MLs on alamut:
- Revision
- 2674
- Author
- misc
- Date
- 2012-03-22 16:18:24 +0100 (Thu, 22 Mar 2012)
Log Message
clean postfix module, rework the layout and split it in several fileModified Paths
- puppet/manifests/nodes/alamut.pp
- puppet/manifests/nodes/krampouezh.pp
- puppet/modules/postfix/manifests/init.pp
Added Paths
Modified: puppet/manifests/nodes/alamut.pp =================================================================== --- puppet/manifests/nodes/alamut.pp 2012-03-22 15:18:21 UTC (rev 2673) +++ puppet/manifests/nodes/alamut.pp 2012-03-22 15:18:24 UTC (rev 2674) @@ -20,7 +20,7 @@ include transifex include bugzilla include sympa::server - include postfix::primary_smtp + include postfix::server::primary # temporary, just the time the vm is running there host { 'friteuse': Modified: puppet/manifests/nodes/krampouezh.pp =================================================================== --- puppet/manifests/nodes/krampouezh.pp 2012-03-22 15:18:21 UTC (rev 2673) +++ puppet/manifests/nodes/krampouezh.pp 2012-03-22 15:18:24 UTC (rev 2674) @@ -5,7 +5,7 @@ # #include common::default_mageia_server include common::default_mageia_server_no_smtp - include postfix::secondary_smtp + include postfix::server::secondary include blog::base include blog::db_backup include mysql::server Modified: puppet/modules/postfix/manifests/init.pp =================================================================== --- puppet/modules/postfix/manifests/init.pp 2012-03-22 15:18:21 UTC (rev 2673) +++ puppet/modules/postfix/manifests/init.pp 2012-03-22 15:18:24 UTC (rev 2674) @@ -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'], - } + service { 'postfix': + subscribe => Package['postfix'], } - - class simple_relay inherits base { - File['/etc/postfix/main.cf'] { - content => template("postfix/simple_relay_main.cf"), - } + file { '/etc/postfix/main.cf': + require => Package['postfix'], + content => '', + notify => Service['postfix'], } - - 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'], - } - } - - class secondary_smtp inherits smtp_server { - } } Added: puppet/modules/postfix/manifests/server/primary.pp =================================================================== --- puppet/modules/postfix/manifests/server/primary.pp (rev 0) +++ puppet/modules/postfix/manifests/server/primary.pp 2012-03-22 15:18:24 UTC (rev 2674) @@ -0,0 +1,37 @@ +class postfix::server::primary inherits postfix::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'], + } +} Added: puppet/modules/postfix/manifests/server/secondary.pp =================================================================== --- puppet/modules/postfix/manifests/server/secondary.pp (rev 0) +++ puppet/modules/postfix/manifests/server/secondary.pp 2012-03-22 15:18:24 UTC (rev 2674) @@ -0,0 +1 @@ +class postfix::server::secondary inherits postfix::server { } Added: puppet/modules/postfix/manifests/server.pp =================================================================== --- puppet/modules/postfix/manifests/server.pp (rev 0) +++ puppet/modules/postfix/manifests/server.pp 2012-03-22 15:18:24 UTC (rev 2674) @@ -0,0 +1,13 @@ +class postfix::server inherits postfix { + 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'), + } +} Added: puppet/modules/postfix/manifests/simple_relay.pp =================================================================== --- puppet/modules/postfix/manifests/simple_relay.pp (rev 0) +++ puppet/modules/postfix/manifests/simple_relay.pp 2012-03-22 15:18:24 UTC (rev 2674) @@ -0,0 +1,5 @@ +class postfix::simple_relay inherits postfix { + File['/etc/postfix/main.cf'] { + content => template('postfix/simple_relay_main.cf'), + } +}