[Mageia-sysadm] [sysadmin-commits] [2674] clean postfix module, rework the layout and split it in several file
Pascal Terjan
pterjan at gmail.com
Thu Mar 22 20:26:11 CET 2012
We seem to reject all mails to MLs on alamut:
Mar 22 20:18:08 alamut postfix/smtpd[1384]: NOQUEUE: reject: RCPT from
valstar.mageia.org[212.85.158.147]: 450 4.1.1 <
packages-commits at ml.mageia.org>: Recipient address rejected: User unknown
in local recipient table; from=<schedbot at valstar.mageia.org> to=<
packages-commits at ml.mageia.org> proto=ESMTP helo=<valstar.mageia.org>
Mar 22 20:18:08 alamut postfix/smtpd[1385]: NOQUEUE: reject: RCPT from
valstar.mageia.org[212.85.158.147]: 450 4.1.1 <changelog at ml.mageia.org>:
Recipient address rejected: User unknown in local recipient table; from=<
schedbot at valstar.mageia.org> to=<changelog at ml.mageia.org> proto=ESMTP helo=<
valstar.mageia.org>
Reported by AL13N as bugzilla fails to send email and gives an error
On Thu, Mar 22, 2012 at 15:18, <root at mageia.org> wrote:
> **
> 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 file
>
> Modified Paths
>
> - puppet/manifests/nodes/alamut.pp<#1363afcdfc8acd3f_puppetmanifestsnodesalamutpp>
> - puppet/manifests/nodes/krampouezh.pp<#1363afcdfc8acd3f_puppetmanifestsnodeskrampouezhpp>
> - puppet/modules/postfix/manifests/init.pp<#1363afcdfc8acd3f_puppetmodulespostfixmanifestsinitpp>
>
> Added Paths
>
> - puppet/modules/postfix/manifests/server/
> - puppet/modules/postfix/manifests/server/primary.pp<#1363afcdfc8acd3f_puppetmodulespostfixmanifestsserverprimarypp>
> - puppet/modules/postfix/manifests/server/secondary.pp<#1363afcdfc8acd3f_puppetmodulespostfixmanifestsserversecondarypp>
> - puppet/modules/postfix/manifests/server.pp<#1363afcdfc8acd3f_puppetmodulespostfixmanifestsserverpp>
> - puppet/modules/postfix/manifests/simple_relay.pp<#1363afcdfc8acd3f_puppetmodulespostfixmanifestssimple_relaypp>
>
> 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'),
> + }
> +}
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20120322/9945203b/attachment-0001.html>
More information about the Mageia-sysadm
mailing list