View | Details | Raw Unified | Return to bug 15307 | Differences between
and this patch

Collapse All | Expand All

(-)debian/postinst (+1 lines)
 Lines 32-37    Link Here 
32 

          32
          

        

        

          33
          
univention-config-registry set postfix/autostart?yes \

          33
          
univention-config-registry set postfix/autostart?yes \

        

        

          34
          
                               postfix/allow-unauth?yes

          34
          
                               postfix/allow-unauth?yes

        

            

              
              
              35
              
univention-config-registry set postfix/ipv6?no

            

        

          35
          

          36
          

        

        

          36
          
eval $(univention-config-registry shell)

          37
          
eval $(univention-config-registry shell)

        

        

          37
          

          38
          

        



(-)debian/univention-mail-postfix-kolab2.univention-config-registry
      (+1 lines)




  

    

    

       Lines 23-28
       
    
  Link Here 
    

  

        

          23
          
Variables: mail/localmailboxsizelimit

          23
          
Variables: mail/localmailboxsizelimit

        

        

          24
          
Variables: postfix/masquerade/domains

          24
          
Variables: postfix/masquerade/domains

        

        

          25
          
Variables: postfix/masquerade/exceptions

          25
          
Variables: postfix/masquerade/exceptions

        

            

              
              
              26
              
Variables: postfix/ipv6

            

        

          26
          
Variables: mail/maps/canonical/sender/enable

          27
          
Variables: mail/maps/canonical/sender/enable

        

        

          27
          
Variables: mail/maps/canonical/sender/classes

          28
          
Variables: mail/maps/canonical/sender/classes

        

        

          28
          
Variables: mail/maps/canonical/recipient/enable

          29
          
Variables: mail/maps/canonical/recipient/enable

        



(-)debian/changelog
      (+13 lines)




  

    

    

       Lines 1-3
       
    
  Link Here 
    

  

            

              
              
              1
              
univention-mail-postfix-kolab2 (3.1.1-1) unstable; urgency=low

            

            

              2
              

            

            

              3
              
  * merged with trunk (Bug #15307)

            

            

              4
              

            

            

              5
              
 -- Kai-Wilhelm Bolte <bolte@univention.de>  Thu,  5 Nov 2009 10:51:01 +0100

            

            

              6
              

            

            

              7
              
univention-mail-postfix-kolab2 (3.1.0-1) unstable; urgency=low

            

            

              8
              

            

            

              9
              
  * new UCR variable postfix/ipv6 will enable / disable IPv6 functionality

            

            

              10
              
    for Postfix (Bug #15307)

            

            

              11
              

            

            

              12
              
 -- Kai-Wilhelm Bolte <bolte@univention.de>  Mon, 24 Aug 2009 16:24:37 +0200

            

            

              13
              

            

        

          1
          
univention-mail-postfix-kolab2 (3.0.2-2) unstable; urgency=low

          14
          
univention-mail-postfix-kolab2 (3.0.2-2) unstable; urgency=low

        

        

          2
          

          15
          

        

        

          3
          
  * updated UCR variable description of mail/postfix/ldap/timeout (Bug 14208)

          16
          
  * updated UCR variable description of mail/postfix/ldap/timeout (Bug 14208)

        



(-)debian/univention-mail-postfix-kolab2.univention-config-registry-variables
      (+6 lines)




  

    

    

       Lines 88-93
       
    
  Link Here 
    

  

        

          88
          
Type=str

          88
          
Type=str

        

        

          89
          
Categories=service-mail

          89
          
Categories=service-mail

        

        

          90
          

          90
          

        

            

              
              
              91
              
[postfix/ipv6]

            

            

              92
              
Description[de]=Aktiviert/Deaktiviert IPv6-Funktionalität in Postfix

            

            

              93
              
Description[en]=Enables/Disables IPv6 funtionality for Postfix

            

            

              94
              
Type=str

            

            

              95
              
Categories=service-mail

            

            

              96
              

            

        

          91
          
[postfix/masquerade/domains]

          97
          
[postfix/masquerade/domains]

        

        

          92
          
Description[de]=Liste von Domänen für die Masquerading aktiviert ist

          98
          
Description[de]=Liste von Domänen für die Masquerading aktiviert ist

        

        

          93
          
Description[en]=List of domains for which masquerading is enabled

          99
          
Description[en]=List of domains for which masquerading is enabled

        



(-)conffiles/etc/postfix/main.cf.d/10_general
      (+11 lines)




  

    

    

       Lines 95-97
       
    
  Link Here 
    

  

        

          95
          
	print 'smtp_sasl_security_options = noanonymous'

          95
          
	print 'smtp_sasl_security_options = noanonymous'

        

        

          96
          
	print 'smtp_sasl_password_maps = hash:/etc/postfix/smtp_auth'

          96
          
	print 'smtp_sasl_password_maps = hash:/etc/postfix/smtp_auth'

        

        

          97
          
@!@

          97
          
@!@

        

            

              
              
              98
              

            

            

              99
              
#

            

            

              100
              
# IPv6 support

            

            

              101
              
# possible settings for inet_protocols are: ipv4 ; all ; ipv4,ipv6 ; ipv6

            

            

              102
              
#

            

            

              103
              
@!@

            

            

              104
              
if not configRegistry.get('postfix/ipv6', 'yes' ).lower() in ( 'no', 'false', '0' ):

            

            

              105
              
        print 'inet_protocols = all'

            

            

              106
              
else:

            

            

              107
              
        print 'inet_protocols = ipv4'

            

            

              108
              
@!@

            






  

  Return to bug 15307