@@ -, +, @@ --- .../univention-mail-postfix/conffiles/etc/aliases | 4 +- .../etc/postfix/ldap.canonicalrecipient.d/10_base | 2 +- .../etc/postfix/ldap.canonicalsender.d/10_base | 4 +- .../conffiles/etc/postfix/ldap.distlist.d/10_base | 2 +- .../conffiles/etc/postfix/ldap.groups.d/10_base | 2 +- .../etc/postfix/ldap.sharedfolderlocal.d/10_base | 2 +- .../etc/postfix/ldap.sharedfolderremote.d/10_base | 2 +- .../conffiles/etc/postfix/ldap.transport.d/10_base | 2 +- .../conffiles/etc/postfix/ldap.virtual.d/10_base | 2 +- .../etc/postfix/ldap.virtualdomains.d/10_base | 2 +- .../postfix/ldap.virtualwithcanonical.d/10_base | 2 +- .../conffiles/etc/postfix/main.cf.d/10_general | 1 - .../conffiles/etc/postfix/transport.d/10_base | 7 +- .../mail/univention-mail-postfix/debian/changelog | 6 + .../debian/univention-mail-postfix.dirs | 4 - ...vention-mail-postfix.univention-config-registry | 204 +++++++++++---------- .../debian/univention-mail-server.dirs | 2 - 17 files changed, 125 insertions(+), 125 deletions(-) delete mode 100644 branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/debian/univention-mail-postfix.dirs delete mode 100644 branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/debian/univention-mail-server.dirs --- a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/aliases +++ a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/aliases @@ -1,7 +1,7 @@ @%@UCRWARNING=# @%@ @!@ -for key in configRegistry.keys(): +for key, value in configRegistry.items(): if key.startswith('mail/alias/'): - print '%s: %s' % (key.split('/')[-1], configRegistry[key]) + print '%s: %s' % (key.split('/')[-1], value) @!@ --- a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.canonicalrecipient.d/10_base +++ a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.canonicalrecipient.d/10_base @@ -12,7 +12,7 @@ version = 3 bind_dn = @%@ldap/hostdn@%@ @!@ import os -from univention.lib.misc import getLDAPURIs +from univention.lib.misc import getLDAPURIs print 'server_host = %s' % getLDAPURIs(configRegistry) if os.path.exists('/etc/machine.secret'): print 'bind_pw = %s' % (open('/etc/machine.secret','r').read()) --- a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.canonicalsender.d/10_base +++ a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.canonicalsender.d/10_base @@ -12,10 +12,10 @@ version = 3 bind_dn = @%@ldap/hostdn@%@ @!@ import os -from univention.lib.misc import getLDAPURIs +from univention.lib.misc import getLDAPURIs print 'server_host = %s' % getLDAPURIs(configRegistry) if os.path.exists('/etc/machine.secret'): - print 'bind_pw = %s' % (open('/etc/machine.secret','r').read()) + print 'bind_pw = %s' % (open('/etc/m:chine.secret','r').read()) else: print 'bind_pw = MACHINE.SECRET_IS_MISSING' if configRegistry.is_true('mail/postfix/ldaptable/starttls', False): --- a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.distlist.d/10_base +++ a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.distlist.d/10_base @@ -12,7 +12,7 @@ version = 3 bind_dn = @%@ldap/hostdn@%@ @!@ import os -from univention.lib.misc import getLDAPURIs +from univention.lib.misc import getLDAPURIs print 'server_host = %s' % getLDAPURIs(configRegistry) if os.path.exists('/etc/machine.secret'): print 'bind_pw = %s' % (open('/etc/machine.secret','r').read()) --- a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.groups.d/10_base +++ a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.groups.d/10_base @@ -13,7 +13,7 @@ version = 3 bind_dn = @%@ldap/hostdn@%@ @!@ import os -from univention.lib.misc import getLDAPURIs +from univention.lib.misc import getLDAPURIs print 'server_host = %s' % getLDAPURIs(configRegistry) if os.path.exists('/etc/machine.secret'): print 'bind_pw = %s' % (open('/etc/machine.secret','r').read()) --- a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.sharedfolderlocal.d/10_base +++ a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.sharedfolderlocal.d/10_base @@ -14,7 +14,7 @@ version = 3 bind_dn = @%@ldap/hostdn@%@ @!@ import os -from univention.lib.misc import getLDAPURIs +from univention.lib.misc import getLDAPURIs print 'server_host = %s' % getLDAPURIs(configRegistry) if os.path.exists('/etc/machine.secret'): print 'bind_pw = %s' % (open('/etc/machine.secret','r').read()) --- a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.sharedfolderremote.d/10_base +++ a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.sharedfolderremote.d/10_base @@ -14,7 +14,7 @@ version = 3 bind_dn = @%@ldap/hostdn@%@ @!@ import os -from univention.lib.misc import getLDAPURIs +from univention.lib.misc import getLDAPURIs print 'server_host = %s' % getLDAPURIs(configRegistry) if os.path.exists('/etc/machine.secret'): print 'bind_pw = %s' % (open('/etc/machine.secret','r').read()) --- a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.transport.d/10_base +++ a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.transport.d/10_base @@ -14,7 +14,7 @@ version = 3 bind_dn = @%@ldap/hostdn@%@ @!@ import os -from univention.lib.misc import getLDAPURIs +from univention.lib.misc import getLDAPURIs print 'server_host = %s' % getLDAPURIs(configRegistry) if os.path.exists('/etc/machine.secret'): print 'bind_pw = %s' % (open('/etc/machine.secret','r').read()) --- a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.virtual.d/10_base +++ a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.virtual.d/10_base @@ -13,7 +13,7 @@ version = 3 bind_dn = @%@ldap/hostdn@%@ @!@ import os -from univention.lib.misc import getLDAPURIs +from univention.lib.misc import getLDAPURIs print 'server_host = %s' % getLDAPURIs(configRegistry) if os.path.exists('/etc/machine.secret'): print 'bind_pw = %s' % (open('/etc/machine.secret','r').read()) --- a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.virtualdomains.d/10_base +++ a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.virtualdomains.d/10_base @@ -13,7 +13,7 @@ version = 3 bind_dn = @%@ldap/hostdn@%@ @!@ import os -from univention.lib.misc import getLDAPURIs +from univention.lib.misc import getLDAPURIs print 'server_host = %s' % getLDAPURIs(configRegistry) if os.path.exists('/etc/machine.secret'): print 'bind_pw = %s' % (open('/etc/machine.secret','r').read()) --- a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.virtualwithcanonical.d/10_base +++ a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/ldap.virtualwithcanonical.d/10_base @@ -13,7 +13,7 @@ version = 3 bind_dn = @%@ldap/hostdn@%@ @!@ import os -from univention.lib.misc import getLDAPURIs +from univention.lib.misc import getLDAPURIs print 'server_host = %s' % getLDAPURIs(configRegistry) if os.path.exists('/etc/machine.secret'): print 'bind_pw = %s' % (open('/etc/machine.secret','r').read()) --- a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/main.cf.d/10_general +++ a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/main.cf.d/10_general @@ -20,7 +20,6 @@ else: # some basic path definitions command_directory = /usr/sbin daemon_directory = /usr/lib/postfix -program_directory = /usr/lib/postfix # some basic mail system settings --- a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/transport.d/10_base +++ a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/conffiles/etc/postfix/transport.d/10_base @@ -1,15 +1,12 @@ @%@UCRWARNING=# @%@ @!@ -import re -for key in configRegistry.keys(): +for key, val in configRegistry.items(): if key.startswith('mail/maps/transport/'): - val = configRegistry[key].strip() + val = val.strip() if ' ' in val: domain, transp = val.split(' ', 1) print '%-30s %s' % (domain, transp) else: print val @!@ - - --- a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/debian/changelog +++ a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/debian/changelog @@ -1,3 +1,9 @@ +univention-mail-postfix (9.0.1-1) unstable; urgency=low + + * Bug #35718: Update UCR templates + + -- Philipp Hahn Wed, 27 Aug 2014 09:17:30 +0200 + univention-mail-postfix (9.0.0-2) unstable; urgency=medium * Update to UCS 4.0 (Bug #35264) --- a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/debian/univention-mail-postfix.dirs +++ a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/debian/univention-mail-postfix.dirs @@ -1,4 +0,0 @@ -usr/lib/univention-install -usr/share/univention-mail-postfix -usr/lib/univention-server/server_password_change.d -etc/univention/templates/scripts/etc/postfix --- a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/debian/univention-mail-postfix.univention-config-registry +++ a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/debian/univention-mail-postfix.univention-config-registry @@ -1,40 +1,22 @@ Type: multifile Multifile: etc/postfix/main.cf + +Type: subfile +Multifile: etc/postfix/main.cf +Subfile: etc/postfix/main.cf.d/10_general +Variables: mail/messagesizelimit +Variables: mail/localmailboxsizelimit Variables: hostname Variables: domainname -Variables: ldap/server/name -Variables: ldap/base -Variables: mail/ldap -Variables: mail/antivir -Variables: mail/relayauth -Variables: mail/relayhost -Variables: mail/archivefolder -Variables: mail/hosteddomains -Variables: mail/postfix/mydomains Variables: mail/postfix/mynetworks -Variables: server/role -Variables: mail/messagesizelimit -Variables: ldap/base -Variables: ldap/port -Variables: ldap/server -Variables: mail/smtp/helo/name -Variables: mail/smtp/VRFY/disabled -Variables: mail/localmailboxsizelimit Variables: mail/postfix/masquerade/domains Variables: mail/postfix/masquerade/exceptions -Variables: mail/maps/canonical/sender/enable -Variables: mail/maps/canonical/sender/classes -Variables: mail/maps/canonical/recipient/enable -Variables: mail/maps/canonical/recipient/classes -Variables: mail/postfix/softbounce +Variables: mail/smtp/helo/name +Variables: mail/relayhost +Variables: mail/relayauth +Variables: mail/smtp/VRFY/disabled Variables: mail/postfix/dnslookups -Variables: mail/postfix/ldap/timeout -Variables: mail/postfix/policy/listfilter -Variables: mail/postfix/smtpd/restrictions/recipient/.* - -Type: subfile -Multifile: etc/postfix/main.cf -Subfile: etc/postfix/main.cf.d/10_general +Variables: mail/postfix/softbounce Variables: mail/postfix/smtp/hostlookup Variables: mail/postfix/maps/transport Variables: mail/postfix/mydestination @@ -48,6 +30,10 @@ Variables: mail/postfix/smtpd/banner Type: subfile Multifile: etc/postfix/main.cf Subfile: etc/postfix/main.cf.d/30_maps +Variables: mail/maps/canonical/sender/enable +Variables: mail/maps/canonical/sender/classes +Variables: mail/maps/canonical/recipient/enable +Variables: mail/maps/canonical/recipient/classes Variables: mail/postfix/virtual/alias/domains Variables: mail/postfix/virtual/alias/maps Variables: mail/postfix/virtual/mailbox/domains @@ -60,10 +46,14 @@ Type: subfile Multifile: etc/postfix/main.cf Subfile: etc/postfix/main.cf.d/50_restrictions Variables: mail/postfix/greylisting +Variables: mail/postfix/smtpd/restrictions/recipient/.* +Variables: mail/postfix/policy/listfilter Type: subfile Multifile: etc/postfix/main.cf Subfile: etc/postfix/main.cf.d/60_tls +Variables: hostname +Variables: domainname Variables: mail/postfix/ssl/certificate Variables: mail/postfix/ssl/key Variables: mail/postfix/tls/client/level @@ -73,31 +63,29 @@ Variables: mail/postfix/ssl/cafile Type: subfile Multifile: etc/postfix/main.cf Subfile: etc/postfix/main.cf.d/80_delivery +Variables: mail/antivir +Variables: mail/archivefolder Type: multifile Multifile: etc/postfix/master.cf -Variables: hostname -Variables: domainname -Variables: mail/antivir -Variables: ldap/base -Variables: ldap/port -Variables: ldap/server -Variables: mail/smtpport -Variables: mail/postfix/policy/listfilter -Variables: mail/postfix/policy/listfilter/maxproc -Variables: mail/postfix/smtpd/debug Type: subfile Multifile: etc/postfix/master.cf Subfile: etc/postfix/master.cf.d/10_services +Variables: mail/postfix/smtpd/debug +Variables: mail/smtpport Type: subfile Multifile: etc/postfix/master.cf Subfile: etc/postfix/master.cf.d/30_antivir +Variables: mail/antivir Type: subfile Multifile: etc/postfix/master.cf Subfile: etc/postfix/master.cf.d/70_policy +Variables: ldap/base +Variables: mail/postfix/policy/listfilter +Variables: mail/postfix/policy/listfilter/maxproc Type: multifile Multifile: etc/postfix/transport @@ -137,157 +125,173 @@ Variables: mail/archivefolder Type: multifile Multifile: etc/postfix/ldap.groups -Variables: mail/postfix/virtual/.* -Variables: ldap/server/name -Variables: ldap/server/port -Variables: ldap/server/addition -Variables: mail/postfix/ldaptable/.* -User: postfix +User: root Group: root Mode: 0440 Type: subfile Multifile: etc/postfix/ldap.groups Subfile: etc/postfix/ldap.groups.d/10_base - -Type: multifile -Multifile: etc/postfix/ldap.transport -Variables: mail/postfix/virtual/.* Variables: ldap/server/name Variables: ldap/server/port Variables: ldap/server/addition -Variables: mail/postfix/ldaptable/.* -User: postfix +Variables: mail/postfix/ldaptable/starttls +Variables: mail/postfix/ldaptable/tlsrequirecert +Variables: mail/postfix/ldaptable/tlscacertfile + +Type: multifile +Multifile: etc/postfix/ldap.transport +User: root Group: root Mode: 0440 Type: subfile Multifile: etc/postfix/ldap.transport Subfile: etc/postfix/ldap.transport.d/10_base - -Type: multifile -Multifile: etc/postfix/ldap.virtualwithcanonical -Variables: mail/postfix/virtual/.* Variables: ldap/server/name Variables: ldap/server/port Variables: ldap/server/addition -Variables: mail/postfix/ldaptable/.* -User: postfix +Variables: mail/postfix/ldaptable/starttls +Variables: mail/postfix/ldaptable/tlsrequirecert +Variables: mail/postfix/ldaptable/tlscacertfile + +Type: multifile +Multifile: etc/postfix/ldap.virtualwithcanonical +User: root Group: root Mode: 0440 Type: subfile Multifile: etc/postfix/ldap.virtualwithcanonical Subfile: etc/postfix/ldap.virtualwithcanonical.d/10_base - -Type: multifile -Multifile: etc/postfix/ldap.sharedfolderremote -Variables: mail/postfix/virtual/.* Variables: ldap/server/name Variables: ldap/server/port Variables: ldap/server/addition -Variables: mail/postfix/ldaptable/.* -User: postfix +Variables: mail/postfix/ldaptable/starttls +Variables: mail/postfix/ldaptable/tlsrequirecert +Variables: mail/postfix/ldaptable/tlscacertfile + +Type: multifile +Multifile: etc/postfix/ldap.sharedfolderremote +User: root Group: root Mode: 0440 Type: subfile Multifile: etc/postfix/ldap.sharedfolderremote Subfile: etc/postfix/ldap.sharedfolderremote.d/10_base - -Type: multifile -Multifile: etc/postfix/ldap.virtual -Variables: mail/postfix/virtual/.* Variables: ldap/server/name Variables: ldap/server/port Variables: ldap/server/addition -Variables: mail/postfix/ldaptable/.* -User: postfix +Variables: mail/postfix/ldaptable/starttls +Variables: mail/postfix/ldaptable/tlsrequirecert +Variables: mail/postfix/ldaptable/tlscacertfile + +Type: multifile +Multifile: etc/postfix/ldap.virtual +User: root Group: root Mode: 0440 Type: subfile Multifile: etc/postfix/ldap.virtual Subfile: etc/postfix/ldap.virtual.d/10_base - -Type: multifile -Multifile: etc/postfix/ldap.virtualdomains -Variables: mail/postfix/virtual/.* +Subfile: etc/postfix/ldap.virtualdomains.d/10_base Variables: ldap/server/name Variables: ldap/server/port Variables: ldap/server/addition -Variables: mail/postfix/ldaptable/.* -User: postfix +Variables: mail/postfix/ldaptable/starttls +Variables: mail/postfix/ldaptable/tlsrequirecert +Variables: mail/postfix/ldaptable/tlscacertfile + +Type: multifile +Multifile: etc/postfix/ldap.virtualdomains +User: root Group: root Mode: 0440 Type: subfile Multifile: etc/postfix/ldap.virtualdomains Subfile: etc/postfix/ldap.virtualdomains.d/10_base - -Type: multifile -Multifile: etc/postfix/ldap.sharedfolderlocal -Variables: mail/postfix/virtual/.* Variables: ldap/server/name Variables: ldap/server/port Variables: ldap/server/addition -Variables: mail/postfix/ldaptable/.* -User: postfix +Variables: mail/postfix/ldaptable/starttls +Variables: mail/postfix/ldaptable/tlsrequirecert +Variables: mail/postfix/ldaptable/tlscacertfile +Variables: mail/postfix/ldaptable/debuglevel + +Type: multifile +Multifile: etc/postfix/ldap.sharedfolderlocal +User: root Group: root Mode: 0440 Type: subfile Multifile: etc/postfix/ldap.sharedfolderlocal Subfile: etc/postfix/ldap.sharedfolderlocal.d/10_base - -Type: multifile -Multifile: etc/postfix/ldap.canonicalrecipient -Variables: mail/postfix/virtual/.* Variables: ldap/server/name Variables: ldap/server/port Variables: ldap/server/addition -Variables: mail/postfix/ldaptable/.* -User: postfix +Variables: mail/postfix/ldaptable/starttls +Variables: mail/postfix/ldaptable/tlsrequirecert +Variables: mail/postfix/ldaptable/tlscacertfile +Variables: mail/postfix/ldaptable/debuglevel + +Type: multifile +Multifile: etc/postfix/ldap.canonicalrecipient +User: root Group: root Mode: 0440 Type: subfile Multifile: etc/postfix/ldap.canonicalrecipient Subfile: etc/postfix/ldap.canonicalrecipient.d/10_base - -Type: multifile -Multifile: etc/postfix/ldap.distlist -Variables: mail/postfix/virtual/.* Variables: ldap/server/name Variables: ldap/server/port Variables: ldap/server/addition -Variables: mail/postfix/ldaptable/.* -User: postfix +Variables: mail/postfix/ldaptable/starttls +Variables: mail/postfix/ldaptable/tlsrequirecert +Variables: mail/postfix/ldaptable/tlscacertfile +Variables: mail/postfix/ldaptable/debuglevel + +Type: multifile +Multifile: etc/postfix/ldap.distlist +User: root Group: root Mode: 0440 Type: subfile Multifile: etc/postfix/ldap.distlist Subfile: etc/postfix/ldap.distlist.d/10_base - -Type: multifile -Multifile: etc/postfix/ldap.canonicalsender -Variables: mail/postfix/virtual/.* Variables: ldap/server/name Variables: ldap/server/port Variables: ldap/server/addition -Variables: mail/postfix/ldaptable/.* -User: postfix +Variables: mail/postfix/ldaptable/starttls +Variables: mail/postfix/ldaptable/tlsrequirecert +Variables: mail/postfix/ldaptable/tlscacertfile +Variables: mail/postfix/ldaptable/debuglevel + +Type: multifile +Multifile: etc/postfix/ldap.canonicalsender +User: root Group: root Mode: 0440 Type: subfile Multifile: etc/postfix/ldap.canonicalsender Subfile: etc/postfix/ldap.canonicalsender.d/10_base +Variables: ldap/server/name +Variables: ldap/server/port +Variables: ldap/server/addition +Variables: mail/postfix/ldaptable/starttls +Variables: mail/postfix/ldaptable/tlsrequirecert +Variables: mail/postfix/ldaptable/tlscacertfile +Variables: mail/postfix/ldaptable/debuglevel Type: file File: etc/postfix/listfilter.secret Variables: mail/postfix/policy/listfilter -User: listfilter +User: root Group: root Mode: 0440 --- a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/debian/univention-mail-server.dirs +++ a/branches/ucs-4.0/ucs-4.0-0/mail/univention-mail-postfix/debian/univention-mail-server.dirs @@ -1,2 +0,0 @@ -usr/lib/univention-install -usr/lib/univention-directory-listener/system --