steffen: server/kolab/kolab imapd.conf.template, 1.8, 1.9 kolab.schema, 1.8, 1.9 kolab_bootstrap, 1.17, 1.18 slapd.conf.template, 1.12, 1.13

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab/kolab
In directory doto:/tmp/cvs-serv17858/kolab/kolab

Modified Files:
	imapd.conf.template kolab.schema kolab_bootstrap 
	slapd.conf.template 
Log Message:
quota stuff

Index: imapd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/imapd.conf.template,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- imapd.conf.template	31 Mar 2004 13:23:12 -0000	1.8
+++ imapd.conf.template	18 Apr 2004 02:51:41 -0000	1.9
@@ -21,7 +21,8 @@
 autocreatequota:        @@@cyrus-autocreatequota@@@
 reject8bit:             no
 munge8bit: 		no
-quotawarn:              90
+quotawarn:              @@@cyrus-quotawarn@@@
+lmtp_over_quota_perm_failure: 1
 timeout:                30
 sievedir:		@l_prefix@/var/imapd/sieve
 lmtpsocket: 		@l_prefix@/var/kolab/lmtp

Index: kolab.schema
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab.schema,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolab.schema	16 Apr 2004 13:13:45 -0000	1.8
+++ kolab.schema	18 Apr 2004 02:51:41 -0000	1.9
@@ -658,6 +658,10 @@
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 
 	EQUALITY booleanMatch )
 
+attributetype ( 1.3.6.1.4.1.19414.2.1.609
+	NAME 'cyrus-quotawarn'
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+
 # apache2 and php specific attributes
 attributetype ( 1.3.6.1.4.1.19414.2.1.701
 	NAME 'apache-http'
@@ -695,7 +699,8 @@
  		postfix-relayhost $ 
 		postfix-transport $
 		postfix-enable-virus-scan $
-	      	cyrus-autocreatequota $ 
+	      	cyrus-autocreatequota $
+		cyrus-quotawarn $ 
 		cyrus-admins $ 
 		cyrus-imap $ 
 		cyrus-pop3 $ 

Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab_bootstrap,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- kolab_bootstrap	16 Apr 2004 13:47:39 -0000	1.17
+++ kolab_bootstrap	18 Apr 2004 02:51:41 -0000	1.18
@@ -49,7 +49,7 @@
    print "Please check $kolab_config (seems to be incomplete)\n";
    die "and run kolab_bootstrap afterwards, manually";
 }
-my $fqdn = `hostname`;
+my $fqdn = `hostname -f`;
 chomp($fqdn);
 
 print "Please enter Hostname [$fqdn]:";
@@ -209,6 +209,7 @@
         #'postfix-transport' => "",
 	'postfix-enable-virus-scan' => "TRUE",
         'cyrus-autocreatequota' => 100000,
+	'cyrus-quotawarn' => 80,
         'cyrus-admins' => "manager",
         'cyrus-imap' => "TRUE",
         'cyrus-pop3' => "FALSE",

Index: slapd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/slapd.conf.template,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- slapd.conf.template	31 Mar 2004 13:23:12 -0000	1.12
+++ slapd.conf.template	18 Apr 2004 02:51:41 -0000	1.13
@@ -56,7 +56,7 @@
 access to attr=mail
         by group="cn=admin,@@@base_dn@@@" write
         by group="cn=maintainer,@@@base_dn@@@" write
-       by * read stop
+        by * read stop
 
 access to attr=alias
         by group="cn=admin,@@@base_dn@@@" write
@@ -67,6 +67,12 @@
         by group="cn=admin,@@@base_dn@@@" write
         by group="cn=maintainer,@@@base_dn@@@" write
         by * read stop
+
+access to attr=userquota
+        by group="cn=admin,@@@base_dn@@@" write
+        by group="cn=maintainer,@@@base_dn@@@" write
+	by self read
+        by * none stop
 
 access to dn="cn=nobody,@@@base_dn@@@"
         by anonymous auth stop