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

Collapse All | Expand All

(-)debian/postinst (+1 lines)
 Lines 31-36    Link Here 
31 
#DEBHELPER#
 31 
#DEBHELPER#
32 

          32
          

        

        

          33
          
univention-config-registry set postfix/autostart=yes

          33
          
univention-config-registry set postfix/autostart=yes

        

            

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

            

        

          34
          

          35
          

        

        

          35
          
eval $(univention-config-registry shell)

          36
          
eval $(univention-config-registry shell)

        

        

          36
          

          37
          

        



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




  

    

    

       Lines 76-81
       
    
  Link Here 
    

  

        

          76
          
Type=str

          76
          
Type=str

        

        

          77
          
Categories=service-mail

          77
          
Categories=service-mail

        

        

          78
          

          78
          

        

            

              
              
              79
              
[postfix/ipv6]

            

            

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

            

            

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

            

            

              82
              
Type=str

            

            

              83
              
Categories=service-mail

            

            

              84
              

            

        

          79
          
[postfix/masquerade/domains]

          85
          
[postfix/masquerade/domains]

        

        

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

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

        

        

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

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

        



(-)debian/changelog
      (+19 lines)




  

    

    

       Lines 1-3
       
    
  Link Here 
    

  

            

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

            

            

              2
              

            

            

              3
              
  * merged with trunk (Bug #15307)

            

            

              4
              

            

            

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

            

            

              6
              

            

            

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

            

            

              8
              

            

            

              9
              
  * small fixes (Bug #15307)

            

            

              10
              

            

            

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

            

            

              12
              

            

            

              13
              
univention-mail-postfix (2.1.0-1) unstable; urgency=low

            

            

              14
              

            

            

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

            

            

              16
              
    (Bug #15307)

            

            

              17
              

            

            

              18
              
 -- Kai-Wilhelm Bolte <bolte@univention.de>  Mon, 24 Aug 2009 13:07:39 +0200

            

            

              19
              

            

        

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

          20
          
univention-mail-postfix (2.0.2-2) unstable; urgency=low

        

        

          2
          

          21
          

        

        

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

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

        



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




  

    

    

       Lines 32-37
       
    
  Link Here 
    

  

        

          32
          
Variables: mail/smtpauth

          32
          
Variables: mail/smtpauth

        

        

          33
          
Variables: mail/smtpport

          33
          
Variables: mail/smtpport

        

        

          34
          
Variables: postfix/zarafa

          34
          
Variables: postfix/zarafa

        

            

              
              
              35
              
Variables: postfix/ipv6

            

        

          35
          

          36
          

        

        

          36
          
Type: file

          37
          
Type: file

        

        

          37
          
File: etc/mailname

          38
          
File: etc/mailname

        



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




  

    

    

       Lines 197-199
       
    
  Link Here 
    

  

        

          197
          
	print '#message_size_limit = 0'

          197
          
	print '#message_size_limit = 0'

        

        

          198
          
@!@

          198
          
@!@

        

        

          199
          

          199
          

        

            

              
              
              200
              
#

            

            

              201
              
# IPv6 support

            

            

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

            

            

              203
              
#

            

            

              204
              
@!@

            

            

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

            

            

              206
              
        print 'inet_protocols = all'

            

            

              207
              
else:

            

            

              208
              
        print 'inet_protocols = ipv4'

            

            

              209
              
@!@

            






  

  Return to bug 15307