[debian-edu-commits] r79031 - in branches/wheezy/debian-edu-config: . cf debian

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-02-11 10:25:58 +0000 (Mon, 11 Feb 2013)
New Revision: 79031

Modified:
   branches/wheezy/debian-edu-config/Makefile
   branches/wheezy/debian-edu-config/cf/cf.imap
   branches/wheezy/debian-edu-config/debian/changelog
Log:
# FIXME: Confirm that the following actually works.
* Fix dovecot setup:
  - Don't modify configfiles
  - Put Debian Edu specific settings into /etc/dovecot/local.conf 

Modified: branches/wheezy/debian-edu-config/Makefile
===================================================================
--- branches/wheezy/debian-edu-config/Makefile	2013-02-11 09:50:13 UTC (rev 79030)
+++ branches/wheezy/debian-edu-config/Makefile	2013-02-11 10:25:58 UTC (rev 79031)
@@ -102,6 +102,7 @@
 	dhcp/dhclient-exit-hooks.d/wpad-proxy-update \
 	dhcp/dhcpd-debian-edu.conf \
 	dhcp/dhclient-debian-edu.conf \
+	dovecot/local.conf \
 	exim4/exim-ldap-client-v4.conf \
 	exim4/exim-ldap-server-v4.conf \
 	filesystems \

Modified: branches/wheezy/debian-edu-config/cf/cf.imap
===================================================================
--- branches/wheezy/debian-edu-config/cf/cf.imap	2013-02-11 09:50:13 UTC (rev 79030)
+++ branches/wheezy/debian-edu-config/cf/cf.imap	2013-02-11 10:25:58 UTC (rev 79031)
@@ -1,69 +1,3 @@
-editfiles:
-
-  debian.server.installation::
-
-    { /etc/dovecot/dovecot.conf
-
-    BeginGroupIfNoSuchLine 'protocols = imap imaps'
-       LocateLineMatching 'protocols = none'
-       ReplaceLineWith 'protocols = imap imaps'
-    EndGroup
- 
-    BeginGroupIfNoSuchLine 'disable_plaintext_auth = yes'
-       LocateLineMatching '#disable_plaintext_auth = yes'
-       InsertLine 'disable_plaintext_auth = yes'
-    EndGroup
-
-    BeginGroupIfNoSuchLine 'mail_location =  maildir:/var/mail/%u'
-       LocateLineMatching '#mail_location =[[:space:]]*'
-       InsertLine 'mail_location =  maildir:/var/mail/%u'
-    EndGroup
-
-    BeginGroupIfNoSuchLine 'auth_krb5_keytab = /etc/krb5.keytab.imap'
-       LocateLineMatching '#auth_krb5_keytab =[[:space:]]*'
-       InsertLine 'auth_krb5_keytab = /etc/krb5.keytab.imap'
-    EndGroup
-
-    BeginGroupIfNoSuchLine '  mechanisms = gssapi'
-       LocateLineMatching '  mechanisms = plain[[:space:]]*'
-       ReplaceLineWith '  mechanisms = gssapi'
-    EndGroup
-
-    BeginGroupIfNoSuchLine '  userdb ldap {'
-       LocateLineMatching '  #userdb ldap \{'
-       IncrementPointer   "3"
-       InsertLine '  userdb ldap {'
-       InsertLine '    args = /etc/dovecot/dovecot-ldap.conf'
-       InsertLine '  }'
-    EndGroup
-
-    }
-
-
-    { /etc/dovecot/dovecot-ldap.conf
-
-    BeginGroupIfNoSuchLine 'hosts = ldap'
-       LocateLineMatching '#hosts =.*'
-       InsertLine 'hosts = ldap'
-    EndGroup
-
-    BeginGroupIfNoSuchLine 'base = dc=skole,dc=skolelinux,dc=no'
-       LocateLineMatching 'base =.*'
-       ReplaceLineWith 'base = dc=skole,dc=skolelinux,dc=no'
-    EndGroup
-
-    BeginGroupIfNoSuchLine 'user_attrs = homeDirectory=home,uidNumber=uid,gidNumber=gid'
-       LocateLineMatching '#user_attrs =.*'
-       InsertLine 'user_attrs = homeDirectory=home,uidNumber=uid,gidNumber=gid'
-    EndGroup
-
-    BeginGroupIfNoSuchLine 'user_filter = (&(objectClass=posixAccount)(uid=%u))'
-       LocateLineMatching '#user_filter =.*'
-       InsertLine 'user_filter = (&(objectClass=posixAccount)(uid=%u))'
-    EndGroup
-
-    }
-
 shellcommands:
 
   debian.server.installation::

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-02-11 09:50:13 UTC (rev 79030)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-02-11 10:25:58 UTC (rev 79031)
@@ -3,6 +3,10 @@
   * Drop setting "allow_weak_crypro = true" in /etc/krb5.conf. Thanks
     to Andreas B. Mundt for the hint.
   * Fix some ltsp related scripts: path of etckeeper, release name. 
+  # FIXME: Confirm that the following actually works.
+  * Fix dovecot setup:
+    - Don't modify configfiles
+    - Put Debian Edu specific settings into /etc/dovecot/local.conf 
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 04 Feb 2013 17:19:04 +0100